drop Apple/HFS bits from the templates (#602)
Drop the remaining non-ppc64le bits from the templates. Make the ISO creation work with xorriso. fixes https://bugzilla.redhat.com/show_bug.cgi?id=1676411
This commit is contained in:
		
							parent
							
								
									301cb15120
								
							
						
					
					
						commit
						d35232d9cc
					
				| @ -1,28 +0,0 @@ | ||||
| # Example filename mapping file | ||||
| # | ||||
| # yaboot		Raw	'UNIX'	'boot'	"Bootstrap" | ||||
| # vmlinux		Raw	'UNIX'	'boot'	"Bootstrap" | ||||
| # | ||||
| # EXTN          XLate   CREATOR   TYPE     Comment | ||||
| COPYING         Ascii   'ttxt'  'ttro'  "Text File" | ||||
| CREDITS         Ascii   'ttxt'  'ttro'  "Text File" | ||||
| README          Ascii   'ttxt'  'ttro'  "Text File" | ||||
| RPM-GPG-KEY     Ascii   'ttxt'  'ttro'  "Text File" | ||||
| RELEASE_NOTES   Ascii   'ttxt'  'ttro'  "Text File" | ||||
| .b              Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file" | ||||
| .gif            Raw     '8BIM'  'GIFf'  "Gif File" | ||||
| .jpg            Raw     '8BIM'  'JPEG'  "Jpeg File" | ||||
| .tif            Raw     '8BIM'  'TIFF'  "Photoshop TIFF image" | ||||
| .hqx            Ascii   'BnHq'  'TEXT'  "BinHex file" | ||||
| .doc            Raw     'MSWD'  'WDBN'  "Word file" | ||||
| .mov            Raw     'TVOD'  'MooV'  "QuickTime Movie" | ||||
| .html           Ascii   'MOSS'  'TEXT'  "HTML File" | ||||
| .htm            Ascii   'MOSS'  'TEXT'  "HTML File" | ||||
| .conf           Ascii   'ttxt'  'TEXT'  "config file" | ||||
| .txt            Ascii   'ttxt'  'TEXT'  "Text File" | ||||
| .tbxi           Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file" | ||||
| .sea            Raw     'aust'  'APPL'  "Self Expanding Archive" | ||||
| .sit            Raw     'SIT!'  'SITD'  "Stuffit Expander file" | ||||
| core.elf        Raw     'chrp'  'tbxi'  "Bootable GRUB2 executable." | ||||
| *               Raw     '????'  '????'  "Unknown" | ||||
| 
 | ||||
| @ -1,74 +0,0 @@ | ||||
| <CHRP-BOOT> | ||||
| <COMPATIBLE> | ||||
| MacRISC MacRISC3 MacRISC4 | ||||
| </COMPATIBLE> | ||||
| 
 | ||||
| <DESCRIPTION> | ||||
| Boot Chooser | ||||
| </DESCRIPTION> | ||||
| 
 | ||||
| <BOOT-SCRIPT> | ||||
| " screen" output | ||||
| load-base release-load-area | ||||
| " /cpus/@0" find-package if | ||||
|  " 64-bit" rot get-package-property 0= if | ||||
|   2drop | ||||
|   " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc64\yaboot.conf" eval | ||||
|  else | ||||
|   " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc32\yaboot.conf" eval | ||||
|  then | ||||
| then | ||||
| </BOOT-SCRIPT> | ||||
| 
 | ||||
| <OS-BADGE-ICONS> | ||||
| 1010 | ||||
| 000000000000F8FEACF6000000000000 | ||||
| 0000000000F5FFFFFEFEF50000000000 | ||||
| 00000000002BFAFEFAFCF70000000000 | ||||
| 0000000000F65D5857812B0000000000 | ||||
| 0000000000F5350B2F88560000000000 | ||||
| 0000000000F6335708F8FE0000000000 | ||||
| 00000000005600F600F5FD8100000000 | ||||
| 00000000F9F8000000F5FAFFF8000000 | ||||
| 000000008100F5F50000F6FEFE000000 | ||||
| 000000F8F700F500F50000FCFFF70000 | ||||
| 00000088F70000F50000F5FCFF2B0000 | ||||
| 0000002F582A00F5000008ADE02C0000 | ||||
| 00090B0A35A62B0000002D3B350A0000 | ||||
| 000A0A0B0B3BF60000505E0B0A0B0A00 | ||||
| 002E350B0B2F87FAFCF45F0B2E090000 | ||||
| 00000007335FF82BF72B575907000000 | ||||
| 000000000000ACFFFF81000000000000 | ||||
| 000000000081FFFFFFFF810000000000 | ||||
| 0000000000FBFFFFFFFFAC0000000000 | ||||
| 000000000081DFDFDFFFFB0000000000 | ||||
| 000000000081DD5F83FFFD0000000000 | ||||
| 000000000081DDDF5EACFF0000000000 | ||||
| 0000000000FDF981F981FFFF00000000 | ||||
| 00000000FFACF9F9F981FFFFAC000000 | ||||
| 00000000FFF98181F9F981FFFF000000 | ||||
| 000000ACACF981F981F9F9FFFFAC0000 | ||||
| 000000FFACF9F981F9F981FFFFFB0000 | ||||
| 00000083DFFBF981F9F95EFFFFFC0000 | ||||
| 005F5F5FDDFFFBF9F9F983DDDD5F0000 | ||||
| 005F5F5F5FDD81F9F9E7DF5F5F5F5F00 | ||||
| 0083DD5F5F83FFFFFFFFDF5F835F0000 | ||||
| 000000FBDDDFACFBACFBDFDFFB000000 | ||||
| 000000000000FFFFFFFF000000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFFFF00000000 | ||||
| 00000000FFFFFFFFFFFFFFFFFF000000 | ||||
| 00000000FFFFFFFFFFFFFFFFFF000000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 | ||||
| 00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFF000000 | ||||
| </OS-BADGE-ICONS> | ||||
| </CHRP-BOOT> | ||||
| @ -1,16 +0,0 @@ | ||||
| init-message = "\nWelcome to the @PRODUCT@ @VERSION@ installer!\nUse 'linux32' for 32-bit kernel.\n\n" | ||||
| timeout=6000 | ||||
| default=linux | ||||
| 
 | ||||
| image=/ppc/ppc64/vmlinuz | ||||
| 	label=linux64 | ||||
| 	alias=linux | ||||
| 	initrd=/ppc/ppc64/ramdisk.image.gz | ||||
| 	read-only | ||||
| 	append="@ROOT@" | ||||
| 
 | ||||
| image=/ppc/ppc32/vmlinuz | ||||
| 	label=linux32 | ||||
| 	initrd=/ppc/ppc32/ramdisk.image.gz | ||||
| 	read-only | ||||
| 	append="@ROOT@" | ||||
| @ -1,9 +0,0 @@ | ||||
| init-message = "\nWelcome to the @BITS@-bit @PRODUCT@ @VERSION@ installer!\nHit <TAB> for boot options.\n\n" | ||||
| timeout=6000 | ||||
| default=linux | ||||
| 
 | ||||
| image=/ppc/ppc@BITS@/vmlinuz | ||||
| 	label=linux | ||||
| 	initrd=/ppc/ppc@BITS@/initrd.img | ||||
| 	read-only | ||||
| 	append="@ROOT@" | ||||
| @ -1,27 +0,0 @@ | ||||
| # Example filename mapping file | ||||
| # | ||||
| # yaboot		Raw	'UNIX'	'boot'	"Bootstrap" | ||||
| # vmlinux		Raw	'UNIX'	'boot'	"Bootstrap" | ||||
| # | ||||
| # EXTN          XLate   CREATOR   TYPE     Comment | ||||
| COPYING         Ascii   'ttxt'  'ttro'  "Text File" | ||||
| CREDITS         Ascii   'ttxt'  'ttro'  "Text File" | ||||
| README          Ascii   'ttxt'  'ttro'  "Text File" | ||||
| RPM-GPG-KEY     Ascii   'ttxt'  'ttro'  "Text File" | ||||
| RELEASE_NOTES   Ascii   'ttxt'  'ttro'  "Text File" | ||||
| .b              Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file" | ||||
| .gif            Raw     '8BIM'  'GIFf'  "Gif File" | ||||
| .jpg            Raw     '8BIM'  'JPEG'  "Jpeg File" | ||||
| .tif            Raw     '8BIM'  'TIFF'  "Photoshop TIFF image" | ||||
| .hqx            Ascii   'BnHq'  'TEXT'  "BinHex file" | ||||
| .doc            Raw     'MSWD'  'WDBN'  "Word file" | ||||
| .mov            Raw     'TVOD'  'MooV'  "QuickTime Movie" | ||||
| .html           Ascii   'MOSS'  'TEXT'  "HTML File" | ||||
| .htm            Ascii   'MOSS'  'TEXT'  "HTML File" | ||||
| .conf           Ascii   'ttxt'  'TEXT'  "config file" | ||||
| .txt            Ascii   'ttxt'  'TEXT'  "Text File" | ||||
| .tbxi           Raw     'chrp'  'tbxi'  "Macintosh Toolbox ROM file" | ||||
| .sea            Raw     'aust'  'APPL'  "Self Expanding Archive" | ||||
| .sit            Raw     'SIT!'  'SITD'  "Stuffit Expander file" | ||||
| *               Raw     '????'  '????'  "Unknown" | ||||
| 
 | ||||
| @ -1,74 +0,0 @@ | ||||
| <CHRP-BOOT> | ||||
| <COMPATIBLE> | ||||
| MacRISC MacRISC3 MacRISC4 | ||||
| </COMPATIBLE> | ||||
| 
 | ||||
| <DESCRIPTION> | ||||
| Boot Chooser | ||||
| </DESCRIPTION> | ||||
| 
 | ||||
| <BOOT-SCRIPT> | ||||
| " screen" output | ||||
| load-base release-load-area | ||||
| " /cpus/@0" find-package if | ||||
|  " 64-bit" rot get-package-property 0= if | ||||
|   2drop | ||||
|   " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc64\yaboot.conf" eval | ||||
|  else | ||||
|   " boot cd:,\ppc\mac\yaboot conf=cd:,\ppc\ppc32\yaboot.conf" eval | ||||
|  then | ||||
| then | ||||
| </BOOT-SCRIPT> | ||||
| 
 | ||||
| <OS-BADGE-ICONS> | ||||
| 1010 | ||||
| 000000000000F8FEACF6000000000000 | ||||
| 0000000000F5FFFFFEFEF50000000000 | ||||
| 00000000002BFAFEFAFCF70000000000 | ||||
| 0000000000F65D5857812B0000000000 | ||||
| 0000000000F5350B2F88560000000000 | ||||
| 0000000000F6335708F8FE0000000000 | ||||
| 00000000005600F600F5FD8100000000 | ||||
| 00000000F9F8000000F5FAFFF8000000 | ||||
| 000000008100F5F50000F6FEFE000000 | ||||
| 000000F8F700F500F50000FCFFF70000 | ||||
| 00000088F70000F50000F5FCFF2B0000 | ||||
| 0000002F582A00F5000008ADE02C0000 | ||||
| 00090B0A35A62B0000002D3B350A0000 | ||||
| 000A0A0B0B3BF60000505E0B0A0B0A00 | ||||
| 002E350B0B2F87FAFCF45F0B2E090000 | ||||
| 00000007335FF82BF72B575907000000 | ||||
| 000000000000ACFFFF81000000000000 | ||||
| 000000000081FFFFFFFF810000000000 | ||||
| 0000000000FBFFFFFFFFAC0000000000 | ||||
| 000000000081DFDFDFFFFB0000000000 | ||||
| 000000000081DD5F83FFFD0000000000 | ||||
| 000000000081DDDF5EACFF0000000000 | ||||
| 0000000000FDF981F981FFFF00000000 | ||||
| 00000000FFACF9F9F981FFFFAC000000 | ||||
| 00000000FFF98181F9F981FFFF000000 | ||||
| 000000ACACF981F981F9F9FFFFAC0000 | ||||
| 000000FFACF9F981F9F981FFFFFB0000 | ||||
| 00000083DFFBF981F9F95EFFFFFC0000 | ||||
| 005F5F5FDDFFFBF9F9F983DDDD5F0000 | ||||
| 005F5F5F5FDD81F9F9E7DF5F5F5F5F00 | ||||
| 0083DD5F5F83FFFFFFFFDF5F835F0000 | ||||
| 000000FBDDDFACFBACFBDFDFFB000000 | ||||
| 000000000000FFFFFFFF000000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFF0000000000 | ||||
| 0000000000FFFFFFFFFFFFFF00000000 | ||||
| 00000000FFFFFFFFFFFFFFFFFF000000 | ||||
| 00000000FFFFFFFFFFFFFFFFFF000000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 | ||||
| 00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 | ||||
| 000000FFFFFFFFFFFFFFFFFFFF000000 | ||||
| </OS-BADGE-ICONS> | ||||
| </CHRP-BOOT> | ||||
| @ -1,16 +0,0 @@ | ||||
| init-message = "\nWelcome to the @PRODUCT@ @VERSION@ installer!\nUse 'linux32' for 32-bit kernel.\n\n" | ||||
| timeout=6000 | ||||
| default=linux | ||||
| 
 | ||||
| image=/ppc/ppc64/vmlinuz | ||||
| 	label=linux64 | ||||
| 	alias=linux | ||||
| 	initrd=/ppc/ppc64/ramdisk.image.gz | ||||
| 	read-only | ||||
| 	append="@ROOT@" | ||||
| 
 | ||||
| image=/ppc/ppc32/vmlinuz | ||||
| 	label=linux32 | ||||
| 	initrd=/ppc/ppc32/ramdisk.image.gz | ||||
| 	read-only | ||||
| 	append="@ROOT@" | ||||
| @ -1,9 +0,0 @@ | ||||
| init-message = "\nWelcome to the @BITS@-bit @PRODUCT@ @VERSION@ installer!\nHit <TAB> for boot options.\n\n" | ||||
| timeout=6000 | ||||
| default=linux | ||||
| 
 | ||||
| image=/ppc/ppc@BITS@/vmlinuz | ||||
| 	label=linux | ||||
| 	initrd=/ppc/ppc@BITS@/initrd.img | ||||
| 	read-only | ||||
| 	append="@ROOT@ rd.live.image quiet" | ||||
| @ -39,8 +39,6 @@ replace @PRODUCT@ '${product.name}'  ${GRUBDIR}/grub.cfg | ||||
| replace @VERSION@ ${product.version} ${GRUBDIR}/grub.cfg | ||||
| replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUBDIR}/grub.cfg | ||||
| 
 | ||||
| install ${configdir}/mapping ${BOOTDIR} | ||||
| 
 | ||||
| ## Install kernel and bootloader config (in separate places for each arch) | ||||
| %for kernel in kernels: | ||||
|     <% | ||||
| @ -82,12 +80,11 @@ install ${configdir}/mapping ${BOOTDIR} | ||||
| ## make boot.iso | ||||
| runcmd xorrisofs -v -U -J -R \ | ||||
|         -o ${outroot}/images/boot.iso \ | ||||
|         -part -hfs -r -l -sysid PPC \ | ||||
|         -r -l -sysid PPC \ | ||||
|         -A "${product.name} ${product.version}" -V '${isolabel}' \ | ||||
|         -volset "${product.version}" -volset-size 1 -volset-seqno 1 \ | ||||
|         -hfs-volid ${product.version} \ | ||||
|         -chrp-boot -map ${inroot}/${configdir}/mapping \ | ||||
|         -no-desktop -allow-multidot -graft-points \ | ||||
|         -chrp-boot \ | ||||
|         -graft-points \ | ||||
|         .discinfo=${outroot}/.discinfo \ | ||||
|         ${BOOTDIR}=${outroot}/${BOOTDIR} \ | ||||
|         ${GRUBDIR}=${outroot}/${GRUBDIR} \ | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user