#
25a7b01d |
| 05-May-2013 |
Ingo Weinhold <ingo_weinhold@gmx.de> |
Merge branch 'master' into package-management
Additional changes: * Add src/system/kernel/lib/zlib, which builds a kernel version of zlib, needed by packagefs. * BuildFeatures: Add a build feature
Merge branch 'master' into package-management
Additional changes: * Add src/system/kernel/lib/zlib, which builds a kernel version of zlib, needed by packagefs. * BuildFeatures: Add a build feature "gcc2" to allow for easier checks. * Referenceable.cpp: Include <OS.h> instead of <debugger.h>. The latter is not needed and prevents building for the build platform. * zlib/zutil.h: Fix gcc 2 build. We really should use the external package instead.
Conflicts: .gitignore build/jam/BuildSetup build/jam/FileRules build/jam/FloppyBootImage build/jam/HaikuImage build/jam/ImageRules build/jam/KernelRules build/jam/NetBootArchive build/jam/OptionalBuildFeatures build/jam/OptionalLibPackages build/jam/OptionalPackageDependencies build/jam/OptionalPackages build/scripts/build_haiku_image configure data/bin/installoptionalpackage data/system/boot/Bootscript headers/os/app/Message.h headers/os/package/PackageInfo.h headers/os/package/PackageInfoAttributes.h headers/os/package/PackageInfoSet.h headers/os/package/PackageRoster.h headers/os/package/PackageVersion.h headers/os/package/hpkg/PackageInfoAttributeValue.h headers/os/storage/FindDirectory.h headers/os/storage/Node.h headers/os/support/StringList.h headers/private/system/directories.h src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp src/add-ons/kernel/file_systems/packagefs/Jamfile src/add-ons/kernel/file_systems/packagefs/Package.cpp src/add-ons/kernel/file_systems/packagefs/Package.h src/add-ons/kernel/file_systems/packagefs/PackageDomain.cpp src/add-ons/kernel/file_systems/packagefs/PackageDomain.h src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp src/add-ons/kernel/file_systems/packagefs/PackageNode.h src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp src/add-ons/kernel/file_systems/packagefs/Version.cpp src/add-ons/kernel/file_systems/packagefs/Version.h src/add-ons/kernel/file_systems/packagefs/Volume.cpp src/add-ons/kernel/file_systems/packagefs/Volume.h src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp src/add-ons/kernel/file_systems/userlandfs/shared/driver_settings.c src/apps/deskbar/BarApp.cpp src/apps/deskbar/BarMenuBar.cpp src/apps/deskbar/BarMenuBar.h src/apps/deskbar/BarView.cpp src/apps/deskbar/BarView.h src/apps/deskbar/BarWindow.cpp src/apps/deskbar/BarWindow.h src/apps/deskbar/DeskbarMenu.cpp src/apps/deskbar/DeskbarMenu.h src/apps/deskbar/DeskbarUtils.cpp src/apps/deskbar/DeskbarUtils.h src/apps/deskbar/ExpandoMenuBar.cpp src/apps/deskbar/ExpandoMenuBar.h src/apps/deskbar/TeamMenu.cpp src/apps/processcontroller/ProcessController.cpp src/apps/remotedesktop/RemoteDesktop.cpp src/bin/bash/config-top.h src/bin/finddir.c src/bin/package/Jamfile src/bin/package/command_add.cpp src/bin/package/command_create.cpp src/bin/package/command_list.cpp src/bin/package_repo/command_list.cpp src/bin/pkgman/command_refresh.cpp src/build/libbe/support/Jamfile src/build/libpackage/Jamfile src/build/libroot/Jamfile src/build/libroot/fs.cpp src/build/libroot/remapped_functions.h src/kits/locale/MutableLocaleRoster.cpp src/kits/opengl/GLRendererRoster.cpp src/kits/package/PackageInfo.cpp src/kits/package/PackageInfoSet.cpp src/kits/package/PackageRoster.cpp src/kits/package/PackageVersion.cpp src/kits/package/RepositoryCache.cpp src/kits/package/hpkg/PackageWriterImpl.cpp src/kits/package/hpkg/ReaderImplBase.cpp src/kits/package/hpkg/WriterImplBase.cpp src/kits/print/PrintTransport.cpp src/kits/print/Printer.cpp src/kits/screensaver/ScreenSaverRunner.cpp src/kits/support/StringList.cpp src/kits/tracker/ContainerWindow.cpp src/kits/tracker/DeskWindow.cpp src/kits/tracker/PoseView.cpp src/libs/print/libprint/Transport.cpp src/preferences/printers/AddPrinterDialog.cpp src/preferences/screensaver/ScreenSaverWindow.cpp src/servers/debug/DebugServer.cpp src/servers/input/AddOnManager.cpp src/servers/media_addon/MediaAddonServer.cpp src/system/boot/Jamfile src/system/boot/loader/Jamfile src/system/boot/loader/loader.cpp src/system/boot/loader/vfs.cpp src/system/kernel/fs/vfs.cpp src/system/kernel/fs/vfs_boot.cpp src/system/libroot/os/find_directory.cpp src/system/runtime_loader/runtime_loader.cpp src/tools/package/Jamfile
show more ...
|
#
a84e14ca |
| 16-Dec-2011 |
Alex Wilson <yourpalal2@gmail.com> |
Merge branch 'master' of git://github.com/haiku/haiku
|
#
e5081da4 |
| 04-Nov-2011 |
François Revol <revol@free.fr> |
Large cleanup of the bootloader shell code. Replaced the x86 comment.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43182 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
34dc9962 |
| 20-Nov-2010 |
François Revol <revol@free.fr> |
Update copyrights. Btw Axel, keyboard.cpp (forked from the bios_ia32 one) is still under "OpenBeOS licence" with 2 other copies, I suppose you are ok to change to MIT ?
git-svn-id: file:///srv/svn/
Update copyrights. Btw Axel, keyboard.cpp (forked from the bios_ia32 one) is still under "OpenBeOS licence" with 2 other copies, I suppose you are ok to change to MIT ?
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39548 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
a3f64d44 |
| 19-Nov-2010 |
François Revol <revol@free.fr> |
Add a comment about why we currently force floppy boot when started from haiku.prg.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39493 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
408aa82a |
| 09-Oct-2010 |
François Revol <revol@free.fr> |
Fix comment.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38906 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
12442ce5 |
| 29-Apr-2009 |
François Revol <revol@free.fr> |
- add a gBootDriveAPI variable telling which method was used to load, - move gBoot* out of the boot sector, - fix the FAT params to actually indicate 1.44kB floppy, - fix the FloppyDrive class to als
- add a gBootDriveAPI variable telling which method was used to load, - move gBoot* out of the boot sector, - fix the FAT params to actually indicate 1.44kB floppy, - fix the FloppyDrive class to also use 18 sectors/track, so now tarfs won't get data from start of disk when on the middle.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30481 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
4fd79012 |
| 27-Apr-2009 |
François Revol <revol@free.fr> |
Finally managed to get floppy boot working for Atari \o/ - loop on Floprd() alternating sides every sect/track, currently hardcoded from the FAT bootblock as probing like the NetBSD loader asserts AR
Finally managed to get floppy boot working for Atari \o/ - loop on Floprd() alternating sides every sect/track, currently hardcoded from the FAT bootblock as probing like the NetBSD loader asserts ARAnyM, - print a dot / sector read in the great tradition of bootloaders, - set gBootedFromImage correctly, - fix the script, make it jam later on.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30455 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
901b8dd2 |
| 26-Apr-2009 |
François Revol <revol@free.fr> |
No reason to keep the .prg startup asm code inside the first 512 bytes, this frees up some space for the floppy code.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30446 a95241bf-73f2-0310-85
No reason to keep the .prg startup asm code inside the first 512 bytes, this frees up some space for the floppy code.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30446 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
317bd7dd |
| 03-Apr-2009 |
Axel Dörfler <axeld@pinc-software.de> |
* Changed directory structure as suggested on the mailing list. * Made the TimeZoneView less error prone, and also actually use Haiku code (the previous check didn't work since it used #if, not #if
* Changed directory structure as suggested on the mailing list. * Made the TimeZoneView less error prone, and also actually use Haiku code (the previous check didn't work since it used #if, not #ifdef). * Also took the liberty to rename our boot loader to haiku_loader, since I had to update the nasm binary anyway. Updated the assembly sources to nasm 2.0. * I haven't found where the synth location in the MIDI code is specified, though. * Also, NetBootArchive, and FloppyBootImage haven't been updated yet. Will do so next. * Some optional packages still put their license to beos/etc/licenses. I didn't update them yet, as we'll probably do so anyway at some point. Also, I think we might want to introduce a common/data/licenses instead for those. * If you encounter any problems, please tell!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29876 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
93861ead |
| 09-Oct-2008 |
François Revol <revol@free.fr> |
Better floppy media descriptor for the fake FAT.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27937 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
b75f915a |
| 23-Jun-2008 |
François Revol <revol@free.fr> |
Some fixed... Stack grows downward on m68k!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26109 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
b45b3d7d |
| 23-Jun-2008 |
François Revol <revol@free.fr> |
- move prg ldscript where it belongs. - added rule for boot .prg, no need to do it by hand :)
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26099 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
82d4bfa3 |
| 26-Jan-2008 |
François Revol <revol@free.fr> |
* better debug output * tries for real hw.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23744 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
588b2cd4 |
| 17-Jan-2008 |
François Revol <revol@free.fr> |
* Fix natfeat debugprintf, it actually works now. * XHDI fixes, unfinished.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23593 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
7ef900d3 |
| 16-Jan-2008 |
François Revol <revol@free.fr> |
It's working \o/ Now starts doing stuff in the loader when bootstrapping the .prg from ARAnyM. For now it just dumps the cookies.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23552 a95241bf-
It's working \o/ Now starts doing stuff in the loader when bootstrapping the .prg from ARAnyM. For now it just dumps the cookies.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23552 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
c4bcf3f9 |
| 15-Jan-2008 |
François Revol <revol@free.fr> |
* Fixes * More test code * it actually runs now, till _start. However, calling TOS from C is broken: we use 32 bit param alignment on funcs, but TOS expects 16 bit... need to use asm macros instead
* Fixes * More test code * it actually runs now, till _start. However, calling TOS from C is broken: we use 32 bit param alignment on funcs, but TOS expects 16 bit... need to use asm macros instead of funcs.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23531 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
005ff052 |
| 14-Jan-2008 |
François Revol <revol@free.fr> |
* checksum should be ok now... * also added fake FAT descriptors to avoid crashing TOS, but it doesn't boot yet as floppy.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23525 a95241bf-73f2-03
* checksum should be ok now... * also added fake FAT descriptors to avoid crashing TOS, but it doesn't boot yet as floppy.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23525 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
b79ea675 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
* Fixes... it now builds and theorically should work, let's see...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23489 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
25044050 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
* jmp is x86... * make the checksumer build under linux and fix it.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23484 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
551d3012 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
* Moved checksum to where it should be. * Added tool to calculate the checksum (TOS wants a real one to 1234, not aa55).
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23483 a95241bf-73f2-0310
* Moved checksum to where it should be. * Added tool to calculate the checksum (TOS wants a real one to 1234, not aa55).
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23483 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|
#
4982c437 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
Forgot a param.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23481 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
286edb37 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
1st try at floppy bootsector.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23480 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
86047718 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
* shell.S must be first
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23473 a95241bf-73f2-0310-859d-f6bbb57e9c96
|
#
110abe94 |
| 13-Jan-2008 |
François Revol <revol@free.fr> |
Make it compile.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23472 a95241bf-73f2-0310-859d-f6bbb57e9c96
|