Launcher cleanup, obsolete references

shockpkg · Oct 9, 2023 · fd331cd · fd331cd
1 parent 555cfa9
commit fd331cd
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 42 deletions.
diff --git a/src/util/mac.test.ts b/src/util/mac.test.ts
@@ -21,16 +21,16 @@ const machoTypes = [
 		launcher:
 			'17414c123fe82ac74a89fad9c80e36d8b612ded5a520e35f3c33eabe75a023a7'
 	},
-	{
-		name: 'slim: ppc64',
-		data: unhex('FE ED FA CF 01 00 00 12 80 00 00 00'),
-		format: {
-			cpuType: 0x01000012,
-			cpuSubtype: 0x80000000
-		},
-		launcher:
-			'9e159161fc21b72de6fddb5fb9c60c0e34e649e4660248778219e58198adfb3d'
-	},
+	// {
+	// 	name: 'slim: ppc64',
+	// 	data: unhex('FE ED FA CF 01 00 00 12 80 00 00 00'),
+	// 	format: {
+	// 		cpuType: 0x01000012,
+	// 		cpuSubtype: 0x80000000
+	// 	},
+	// 	launcher:
+	// 		'9e159161fc21b72de6fddb5fb9c60c0e34e649e4660248778219e58198adfb3d'
+	// },
 	{
 		name: 'slim: i386',
 		data: unhex('CE FA ED FE 07 00 00 00 03 00 00 00'),
@@ -41,47 +41,69 @@ const machoTypes = [
 		launcher:
 			'e52e19fce336130824dcfd4731bf85db7e8e96628ef8c6a49769dc5247ef6ed0'
 	},
+	// {
+	// 	name: 'slim: x86_64',
+	// 	data: unhex('CF FA ED FE 07 00 00 01 03 00 00 80'),
+	// 	format: {
+	// 		cpuType: 0x01000007,
+	// 		cpuSubtype: 0x80000003
+	// 	},
+	// 	launcher:
+	// 		'f5b7625da819324f442cea1f3af83ea4b2bf0af1d185a7747d81b698a6168562'
+	// },
+	// {
+	// 	name: 'fat: ppc, ppc64, i386, x86_64',
+	// 	data: unhex(
+	// 		[
+	// 			'CA FE BA BE 00 00 00 04',
+	// 			'00 00 00 12 00 00 00 0A 00 00 00 00 00 00 00 00 00 00 00 00',
+	// 			'01 00 00 12 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00',
+	// 			'00 00 00 07 00 00 00 03 00 00 00 00 00 00 00 00 00 00 00 00',
+	// 			'01 00 00 07 80 00 00 03 00 00 00 00 00 00 00 00 00 00 00 00'
+	// 		].join('')
+	// 	),
+	// 	format: [
+	// 		{
+	// 			cpuType: 0x00000012,
+	// 			cpuSubtype: 10
+	// 		},
+	// 		{
+	// 			cpuType: 0x01000012,
+	// 			cpuSubtype: 0x80000000
+	// 		},
+	// 		{
+	// 			cpuType: 0x00000007,
+	// 			cpuSubtype: 3
+	// 		},
+	// 		{
+	// 			cpuType: 0x01000007,
+	// 			cpuSubtype: 0x80000003
+	// 		}
+	// 	],
+	// 	launcher:
+	// 		'4646bb12e944d4cc2e1b2649b5b33112237a69e01d1aa30d64994135b7969b1d'
+	// }
 	{
-		name: 'slim: x86_64',
-		data: unhex('CF FA ED FE 07 00 00 01 03 00 00 80'),
-		format: {
-			cpuType: 0x01000007,
-			cpuSubtype: 0x80000003
-		},
-		launcher:
-			'f5b7625da819324f442cea1f3af83ea4b2bf0af1d185a7747d81b698a6168562'
-	},
-	{
-		name: 'fat: ppc, ppc64, i386, x86_64',
+		name: 'fat: ppc, i386',
 		data: unhex(
 			[
-				'CA FE BA BE 00 00 00 04',
+				'CA FE BA BE 00 00 00 02',
 				'00 00 00 12 00 00 00 0A 00 00 00 00 00 00 00 00 00 00 00 00',
-				'01 00 00 12 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00',
-				'00 00 00 07 00 00 00 03 00 00 00 00 00 00 00 00 00 00 00 00',
-				'01 00 00 07 80 00 00 03 00 00 00 00 00 00 00 00 00 00 00 00'
+				'00 00 00 07 00 00 00 03 00 00 00 00 00 00 00 00 00 00 00 00'
 			].join('')
 		),
 		format: [
 			{
 				cpuType: 0x00000012,
 				cpuSubtype: 10
 			},
-			{
-				cpuType: 0x01000012,
-				cpuSubtype: 0x80000000
-			},
 			{
 				cpuType: 0x00000007,
 				cpuSubtype: 3
-			},
-			{
-				cpuType: 0x01000007,
-				cpuSubtype: 0x80000003
 			}
 		],
 		launcher:
-			'4646bb12e944d4cc2e1b2649b5b33112237a69e01d1aa30d64994135b7969b1d'
+			'fcf8fa0449ff4e6302deb70d5223a962f878ab046c3bf1fb0d9522ac07847adb'
 	}
 ];
 

diff --git a/src/util/windows.test.ts b/src/util/windows.test.ts
@@ -9,14 +9,11 @@ function sha256(data: Buffer) {
 }
 
 const launcherTypes: ['i686' | 'x86_64', string][] = [
-	[
-		'i686',
-		'166e5cb9228842e98e59d0cae1578fd0d97c9754944dae6533678716f7fd1c1c'
-	],
-	[
-		'x86_64',
-		'6a8e15452b1049ed9727eee65e1f8c81a6ff496f7e452c75268e2c3193dd61b1'
-	]
+	['i686', '166e5cb9228842e98e59d0cae1578fd0d97c9754944dae6533678716f7fd1c1c']
+	// [
+	// 	'x86_64',
+	// 	'6a8e15452b1049ed9727eee65e1f8c81a6ff496f7e452c75268e2c3193dd61b1'
+	// ]
 ];
 
 void describe('util/windows', () => {