[haiku-commits] haiku: hrev46825 - build/jam/images src/apps/bootmanager
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 6 Feb 2014 06:22:13 +0100 (CET)
hrev46825 adds 1 changeset to branch 'master'
old head: a96e17ba9d3cf1b7e576fb62a7f06ffbe80cfc97
new head: b41ab65bd4aca837e26e3a7dec767da6fb71a0a4
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b41ab65+%5Ea96e17b
----------------------------------------------------------------------------
b41ab65: x86_64: Add BootManager, writembr
* Fix build of BootManager on x86_64 (signed vs unsigned error)
* Throw in writembr as it seems to build (untested)
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46825
Commit: b41ab65bd4aca837e26e3a7dec767da6fb71a0a4
URL: http://cgit.haiku-os.org/haiku/commit/?id=b41ab65
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Feb 6 05:25:26 2014 UTC
----------------------------------------------------------------------------
2 files changed, 5 insertions(+), 3 deletions(-)
build/jam/images/HaikuImage | 4 ++--
src/apps/bootmanager/LegacyBootMenu.cpp | 4 +++-
----------------------------------------------------------------------------
diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index 0886986..a43bdb9 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -39,13 +39,13 @@ SYSTEM_BIN = [ FFilterByBuildFeatures
uname unchop unexpand unmount uniq unlink unshar unzip unzipsfx
<bin>updatedb uptime urlwrapper useradd userdel uudecode uuencode
vdir version vmstat
- waitfor watch wc wget whoami writembr@x86 xargs xres
+ waitfor watch wc wget whoami writembr@x86,x86_64 xargs xres
yes
zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
] ;
SYSTEM_APPS = [ FFilterByBuildFeatures
- AboutSystem ActivityMonitor BootManager@x86 CDPlayer CharacterMap
+ AboutSystem ActivityMonitor BootManager@x86,x86_64 CDPlayer CharacterMap
CodyCam Debugger DeskCalc Devices DiskProbe DiskUsage DriveSetup
Expander GLInfo@x86 HaikuDepot Icon-O-Matic Installer LaunchBox Magnify
Mail
MediaConverter MediaPlayer MidiPlayer NetworkStatus PackageInstaller
People
diff --git a/src/apps/bootmanager/LegacyBootMenu.cpp
b/src/apps/bootmanager/LegacyBootMenu.cpp
index 0e30e7c..9fe02be 100644
--- a/src/apps/bootmanager/LegacyBootMenu.cpp
+++ b/src/apps/bootmanager/LegacyBootMenu.cpp
@@ -319,8 +319,10 @@ LegacyBootMenu::CanBeInstalled(const BootDrive& drive)
device.VisitEachDescendant(&visitor);
// 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_OK;
}
Other related posts:
- » [haiku-commits] haiku: hrev46825 - build/jam/images src/apps/bootmanager - kallisti5
