i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64: Add BootManager, writembr

Browse Source 
* Fix build of BootManager on x86_64 (signed vs unsigned error)
* Throw in writembr as it seems to build (untested)
This commit is contained in:
Alexander von Gluck IV
2014-02-05 23:25:26 -06:00
parent a96e17ba9d
commit b41ab65bd4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
+2 -2
View File
@@ -39,13 +39,13 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
uname unchop unexpand unmount uniq unlink unshar unzip unzipsfx uname unchop unexpand unmount uniq unlink unshar unzip unzipsfx
<bin>updatedb uptime urlwrapper useradd userdel uudecode uuencode <bin>updatedb uptime urlwrapper useradd userdel uudecode uuencode
vdir version vmstat vdir version vmstat
waitfor watch wc wget whoami writembr@x86 xargs xres waitfor watch wc wget whoami writembr@x86,x86_64 xargs xres
yes yes
zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
] ; ] ;
SYSTEM_APPS = [ FFilterByBuildFeatures SYSTEM_APPS = [ FFilterByBuildFeatures
AboutSystem ActivityMonitor BootManager@x86 CDPlayer CharacterMap AboutSystem ActivityMonitor BootManager@x86,x86_64 CDPlayer CharacterMap
CodyCam Debugger DeskCalc Devices DiskProbe DiskUsage DriveSetup CodyCam Debugger DeskCalc Devices DiskProbe DiskUsage DriveSetup
Expander GLInfo@x86 HaikuDepot Icon-O-Matic Installer LaunchBox Magnify Mail Expander GLInfo@x86 HaikuDepot Icon-O-Matic Installer LaunchBox Magnify Mail
MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller People
src/apps/bootmanager/LegacyBootMenu.cpp
+3 -1
View File
@@ -319,8 +319,10 @@ LegacyBootMenu::CanBeInstalled(const BootDrive& drive)
device.VisitEachDescendant(&visitor); device.VisitEachDescendant(&visitor);
// Enough space to write boot menu to drive? // Enough space to write boot menu to drive?
if (!visitor.HasPartitions() || visitor.FirstOffset() < sizeof(kBootLoader)) if (!visitor.HasPartitions()
|| visitor.FirstOffset() < (int)sizeof(kBootLoader)) {
return B_PARTITION_TOO_SMALL; return B_PARTITION_TOO_SMALL;
}
return B_OK; return B_OK;
} }