dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-10 10:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #802 from Arawn-Davies/for_cosmosos

Browse source 
Updating Syslinux to version 6.03
This commit is contained in:
jp2masa 2017-11-08 21:09:09 +00:00 committed by GitHub
commit 4cf4e47912
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Build/ISO/isolinux.bin
View file

Binary file not shown.

BIN
Build/ISO/ldlinux.c32 Normal file
View file

Binary file not shown.

BIN
Build/ISO/mboot.c32 Normal file
View file

Binary file not shown.

2
Build/VMWare/Workstation/Cosmos.vmx
View file

@ -42,7 +42,7 @@ scsi0.pciSlotNumber = "16"
vmci0.pciSlotNumber = "32"
vmotion.checkpointFBSize = "23920640"
vmci0.id = "1821907405"
monitor.allowLegacyCPU = "TRUE"
serial0.present = "TRUE"
serial0.yieldOnMsrRead = "TRUE"
serial0.fileType = "pipe"

BIN
Build/ldlinux.c32 Normal file
View file

Binary file not shown.

BIN
Build/libcom32.c32 Normal file
View file

Binary file not shown.

BIN
Build/mboot.c32
View file

Binary file not shown.

6
Setup/Cosmos.iss
View file

@ -105,13 +105,19 @@ Source: ".\Build\VMware\*"; DestDir: "{app}\Build\VMware"; Flags: ignoreversion
; ISO
Source: ".\Build\ISO\*"; DestDir: "{app}\Build\ISO"
Source: ".\Build\mboot.c32"; DestDir: "{app}\Build\ISO\"
Source: ".\Build\ldlinux.c32"; DestDir: "{app}\Build\ISO\"
Source: ".\Build\syslinux.cfg"; DestDir: "{app}\Build\ISO\"
Source: ".\Build\libcom32.c32"; DestDir: "{app}\Build\ISO\"
; USB
Source: ".\Build\mboot.c32"; DestDir: "{app}\Build\USB\"
Source: ".\Build\ldlinux.c32"; DestDir: "{app}\Build\USB\"
Source: ".\Build\libcom32.c32"; DestDir: "{app}\Build\USB\"
Source: ".\Build\syslinux.cfg"; DestDir: "{app}\Build\USB\"
; PXE
Source: ".\Build\PXE\*"; DestDir: "{app}\Build\PXE"
Source: ".\Build\mboot.c32"; DestDir: "{app}\Build\PXE\"
Source: ".\Build\ldlinux.c32"; DestDir: "{app}\Build\PXE\"
Source: ".\Build\libcom32.c32"; DestDir: "{app}\Build\PXE\"
Source: ".\Build\syslinux.cfg"; DestDir: "{app}\Build\PXE\pxelinux.cfg"; DestName: "default"
; VSIP
Source: ".\Build\Tools\VSIXBootstrapper.exe"; DestDir: "{app}\Build\Tools"; Flags: ignoreversion uninsremovereadonly

2
source/Cosmos.Build.Common/IsoMaker.cs
View file

@ -24,6 +24,8 @@ namespace Cosmos.Build.Common
File.Copy(Path.Combine(buildISO, "isolinux.bin"), Path.Combine(isoDirectory, "isolinux.bin"));
File.Copy(Path.Combine(buildISO, "mboot.c32"), Path.Combine(isoDirectory, "mboot.c32"));
File.Copy(Path.Combine(buildISO, "syslinux.cfg"), Path.Combine(isoDirectory, "syslinux.cfg"));
File.Copy(Path.Combine(buildISO, "ldlinux.c32"), Path.Combine(isoDirectory, "ldlinux.c32"));
File.Copy(Path.Combine(buildISO, "libcom32.c32"), Path.Combine(isoDirectory, "libcom32.c32"));
File.Copy(imageFile, Path.Combine(isoDirectory, "Cosmos.bin"));
string arg =

49
source/Cosmos.Build.Common/UsbMaker.cs
View file

@ -5,29 +5,34 @@ using System.Linq;
using System.Text;
using System.IO;
namespace Cosmos.Build.Common {
public class UsbMaker {
namespace Cosmos.Build.Common
{
public class UsbMaker
{
static public void Generate(string aDrive, string aKernelFile)
{
string xDrive = aDrive + @":\";
string xPathUSB = Path.Combine(CosmosPaths.Build, "USB");
static public void Generate(string aDrive, string aKernelFile) {
string xDrive = aDrive + @":\";
string xPathUSB = Path.Combine(CosmosPaths.Build, "USB");
// Copy to USB device
File.Copy(Path.Combine(xPathUSB, "mboot.c32"), xDrive + "mboot.c32", true);
File.Copy(Path.Combine(xPathUSB, "syslinux.cfg"), xDrive + "syslinux.cfg", true);
File.Copy(Path.Combine(xPathUSB, "ldlinux.c32"), xDrive + "ldlinux.c32");
File.Copy(Path.Combine(xPathUSB, "libcom32.c32"), xDrive + "libcom32.c32");
File.Copy(aKernelFile, xDrive + "Cosmos.bin", true);
//File.Copy(Path.Combine(xPathUSB, "syslinux-x86.efi"), xDrive + "syslinux-x86.efi", true);
//File.Copy(Path.Combine(xPathUSB, "syslinux-x64.efi"), xDrive + "syslinux-x64.efi", true);
// Copy to USB device
File.Copy(Path.Combine(xPathUSB, "mboot.c32"), xDrive + "mboot.c32", true);
File.Copy(Path.Combine(xPathUSB, "syslinux.cfg"), xDrive + "syslinux.cfg", true);
File.Copy(aKernelFile, xDrive + "Cosmos.bin", true);
// Set MBR
//
// In future we might be able to bring this in house to reduce external calls.
// - syslinux-4.05\win\syslinux.c - has source we need.
// - http://www.fort-awesome.net/blog/2010/03/25/MBR_VBR_and_Raw_Disk
//
var xPSI = new ProcessStartInfo(Path.Combine(CosmosPaths.Tools, "syslinux.exe"), "-fma " + aDrive + ":");
xPSI.UseShellExecute = false;
xPSI.CreateNoWindow = true;
Process.Start(xPSI);
// Set MBR
//
// In future we might be able to bring this in house to reduce external calls.
// - syslinux-4.05\win\syslinux.c - has source we need.
// - http://www.fort-awesome.net/blog/2010/03/25/MBR_VBR_and_Raw_Disk
//
var xPSI = new ProcessStartInfo(Path.Combine(CosmosPaths.Tools, "syslinux.exe"), "-fma " + aDrive + ":");
xPSI.UseShellExecute = false;
xPSI.CreateNoWindow = true;
Process.Start(xPSI);
}
}
}
}