Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Installer and DriveSetup to image.

Browse Source
This commit is contained in:
Alex Smith 2012-08-18 10:36:00 +01:00
parent 7e5b39b672
commit 816aded4c1
7 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build/jam/Haiku64Image
View File

@ -19,23 +19,23 @@ if $(HAIKU_ATA_STACK) = 1 {
IDE_ONLY = "" ;
}
SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr chgrp chmod
chown chroot cksum clear clockconfig cmp collectcatkeys comm compress
copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs
chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm
compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du
dumpcatalog echo eject env error expand expr factor false find finddir
fmt fold fortune gawk gdb gzip gzexe getlimits grep groups head hostname id
ifconfig <bin>install isvolume join kernel_debugger kill less lessecho
lesskey link linkcatkeys listdev ln locale locate logger logname ls md5sum
mkdir mkfifo mktemp mount mountvolume mv nl nohup nproc od paste patch
pathchk ping pr printenv printf ps ptx pwd rc readlink ReadOnlyBootPrompt
rm rmattr rmdir safemode sdiff seq sha1sum shred shuf sleep sort split stat
strace stty su sum sync sysinfo tac tail tee test timeout touch tr true
truncate tsort tty unexpand uname uniq unlink unmount unzip <bin>updatedb
waitfor wc wget whoami xargs xres yes zdiff zforce zgrep zip zipcloak
<bin>zipgrep zipnote zipsplit zmore znew
lesskey link linkcatkeys listdev ln locale locate logger logname ls
makebootable md5sum mkdir mkfifo mkfs mktemp mount mountvolume mv nl
nohup nproc od paste patch pathchk ping pr printenv printf ps ptx pwd rc
readlink ReadOnlyBootPrompt rm rmattr rmdir safemode sdiff seq sha1sum
shred shuf sleep sort split stat strace stty su sum sync sysinfo tac tail
tee test timeout touch tr true truncate tsort tty unexpand uname uniq
unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs xres yes
zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
;
SYSTEM_APPS = AboutSystem Terminal ;
SYSTEM_APPS = AboutSystem DriveSetup Installer Terminal ;
SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes
Keyboard Keymap Locale Mouse Network Notifications Screen Time Touchpad
@ -170,7 +170,7 @@ AddDirectoryToHaikuImage home mail out ;
AddSymlinkToHaikuImage home config : settings/deskbar : be ;
# Deskbar Application links
AddDirectoryToHaikuImage home config settings deskbar Applications ;
DESKBAR_APPLICATIONS = Terminal ;
DESKBAR_APPLICATIONS = DriveSetup Installer Terminal ;
local linkTarget ;
for linkTarget in $(DESKBAR_APPLICATIONS) {
AddSymlinkToHaikuImage home config settings deskbar Applications
@ -331,6 +331,9 @@ AddFilesToHaikuImage system add-ons kernel network datalink_protocols
AddFilesToHaikuImage system add-ons kernel network protocols
: $(SYSTEM_NETWORK_PROTOCOLS) ;
AddFilesToHaikuImage system add-ons disk_systems
: <disk_system>intel <disk_system>bfs ;
# create directories that will remain empty
AddDirectoryToHaikuImage common bin ;
AddDirectoryToHaikuImage common include ;

4
src/add-ons/disk_systems/bfs/BFSAddOn.cpp
View File

@ -255,11 +255,11 @@ BFSPartitionHandle::Repair(bool checkOnly)
while (ioctl(fd, BFS_IOCTL_CHECK_NEXT_NODE, &result,
sizeof(result)) == 0) {
if (++counter % 50 == 0)
printf("%9Ld nodes processed\x1b[1A\n", counter);
printf("%9" B_PRId64 " nodes processed\x1b[1A\n", counter);
if (result.pass == BFS_CHECK_PASS_BITMAP) {
if (result.errors) {
printf("%s (inode = %lld)", result.name, result.inode);
printf("%s (inode = %" B_PRIdINO ")", result.name, result.inode);
if ((result.errors & BFS_MISSING_BLOCKS) != 0)
printf(", some blocks weren't allocated");
if ((result.errors & BFS_BLOCKS_ALREADY_SET) != 0)

2
src/apps/drivesetup/DriveSetup.cpp
View File

@ -23,7 +23,7 @@
DriveSetup::DriveSetup()
: BApplication("application/x-vnd.Haiku-DriveSetup"),
fWindow(NULL),
fSettings(0UL)
fSettings((uint32)0)
{
}

4
src/apps/drivesetup/MainWindow.cpp
View File

@ -518,9 +518,9 @@ void
MainWindow::_UpdateMenus(BDiskDevice* disk,
partition_id selectedPartition, partition_id parentID)
{
while (BMenuItem* item = fFormatMenu->RemoveItem(0L))
while (BMenuItem* item = fFormatMenu->RemoveItem((int32)0))
delete item;
while (BMenuItem* item = fDiskInitMenu->RemoveItem(0L))
while (BMenuItem* item = fDiskInitMenu->RemoveItem((int32)0))
delete item;
fCreateMI->SetEnabled(false);

12
src/apps/drivesetup/Support.cpp
View File

@ -28,14 +28,14 @@ void
dump_partition_info(const BPartition* partition)
{
char size[1024];
printf("\tOffset(): %Ld\n", partition->Offset());
printf("\tOffset(): %" B_PRIdOFF "\n", partition->Offset());
printf("\tSize(): %s\n", string_for_size(partition->Size(), size,
sizeof(size)));
printf("\tContentSize(): %s\n", string_for_size(partition->ContentSize(),
size, sizeof(size)));
printf("\tBlockSize(): %ld\n", partition->BlockSize());
printf("\tIndex(): %ld\n", partition->Index());
printf("\tStatus(): %ld\n\n", partition->Status());
printf("\tBlockSize(): %" B_PRId32 "\n", partition->BlockSize());
printf("\tIndex(): %" B_PRId32 "\n", partition->Index());
printf("\tStatus(): %" B_PRId32 "\n\n", partition->Status());
printf("\tContainsFileSystem(): %s\n",
partition->ContainsFileSystem() ? "true" : "false");
printf("\tContainsPartitioningSystem(): %s\n\n",
@ -44,12 +44,12 @@ dump_partition_info(const BPartition* partition)
printf("\tIsReadOnly(): %s\n", partition->IsReadOnly() ? "true" : "false");
printf("\tIsMounted(): %s\n", partition->IsMounted() ? "true" : "false");
printf("\tIsBusy(): %s\n\n", partition->IsBusy() ? "true" : "false");
printf("\tFlags(): %lx\n\n", partition->Flags());
printf("\tFlags(): %" B_PRIx32 "\n\n", partition->Flags());
printf("\tName(): %s\n", partition->Name());
printf("\tContentName(): %s\n", partition->ContentName());
printf("\tType(): %s\n", partition->Type());
printf("\tContentType(): %s\n", partition->ContentType());
printf("\tID(): %lx\n\n", partition->ID());
printf("\tID(): %" B_PRIx32 "\n\n", partition->ID());
}

4
src/apps/installer/ProgressReporter.cpp
View File

@ -69,8 +69,8 @@ ProgressReporter::StartTimer()
{
fStartTime = system_time();
printf("%lld bytes to write in %lld files\n", fBytesToWrite,
fItemsToWrite);
printf("%" B_PRIdOFF " bytes to write in %" B_PRId64 " files\n",
fBytesToWrite, fItemsToWrite);
if (fMessage) {
BMessage message(*fMessage);

2
src/apps/installer/UnzipEngine.cpp
View File

@ -83,7 +83,7 @@ UnzipEngine::SetTo(const char* pathToPackage, const char* destinationFolder)
ret = commandPipe.ReadLines(stdOutAndErrPipe, this);
fRetrievingListing = false;
printf("%llu items in %llu bytes\n", fItemsToUncompress,
printf("%" B_PRIu64 " items in %" B_PRIdOFF " bytes\n", fItemsToUncompress,
fBytesToUncompress);
return ret;