Skip to content

Commit

Permalink
Sync with upstream, 3.0 version tagging
Browse files Browse the repository at this point in the history
  • Loading branch information
klange committed Mar 15, 2015
2 parents c2b3938 + f33f723 commit cc9cdd8
Show file tree
Hide file tree
Showing 300 changed files with 16,896 additions and 7,541 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -19,6 +19,9 @@ kernel/symbols.s
.ramdisk_size
tmp/
ramdisk_source/
util/*.img
util/*.vmdk
util/*.vdi
bootdisk.img
bootloader/stage1.bin
bootloader/stage2.bin
Expand Down Expand Up @@ -63,3 +66,5 @@ util/bin/*
util/toaru-toolchain
util/toaru-toolchain/*
_hdd
qemu-vlan0.pcap
contrib
9 changes: 9 additions & 0 deletions .travis.yml
@@ -0,0 +1,9 @@
language: c
script: ./util/build-travis.sh
notifications:
irc:
channels:
- "irc.freenode.org#toaruos"
use_notice: true
skip_join: true

35 changes: 0 additions & 35 deletions LICENSE

This file was deleted.

49 changes: 45 additions & 4 deletions docs/thirdparty.md → LICENSE.md
@@ -1,3 +1,40 @@
## License ##

This project is released under the terms of the University of Illinois / NCSA Open Source License, an OSI- and FSF-approved, GPL-compatible open source license. The NCSA License is a derivative of the MIT license and the BSD license; it is reproduced here for your convenience:

Copyright (c) 2011-2015 Kevin Lange. All rights reserved.

Dedicated to the memory of
Dennis Ritchie
1941-2011

Developed by: ToAruOS Kernel Development Team
http://toaruos.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal with the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimers.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimers in the
documentation and/or other materials provided with the distribution.
3. Neither the names of the ToAruOS Kernel Development Team, Kevin Lange,
nor the names of its contributors may be used to endorse
or promote products derived from this Software without specific prior
written permission.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
WITH THE SOFTWARE.

## Additional Licenses ##

ToAruOS contains a number of third-party packages under various licenses. Those which are included within this repository are listed below. Some packages are retrieved from their respective sources - licenses for these packages are not included here, but should be available from the respective directories in `toolchain/tarballs/`.
Expand Down Expand Up @@ -88,6 +125,13 @@ ToAruOS contains a number of third-party packages under various licenses. Those
or Bitstream Inc., respectively. For further information, contact:
fonts at gnome dot org.

* As of April 29, 2014, the Symbola font is provided. There is no license associated with the Symbola font, though the following conditions apply:

In lieu of a license
Fonts in this site are offered free for any use; they may be installed,
embedded, opened, edited, modified, regenerated, posted,
packaged and redistributed. - George Douros

* The included SHA512 support library (userspace/lib/sha2.{c,h}) is provided under the BSD license as follows:

Copyright (c) 2000-2001, Aaron D. Gifford
Expand Down Expand Up @@ -117,10 +161,6 @@ ToAruOS contains a number of third-party packages under various licenses. Those
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.

* The DMZ mouse cursor theme is licensed under the Creative Commons Attribution-ShareAlike 3.0 license with the following copyright notice:

Copyright © 2007-2010 Novell, Inc.

* Bjoern Hoehrmann's super-simple UTF8 decoder is included for use in userspace applications and is provided under the following license:

Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
Expand Down Expand Up @@ -202,3 +242,4 @@ ToAruOS contains a number of third-party packages under various licenses. Those
* [GNU ncurses](http://www.gnu.org/software/ncurses/)
* [Vim](http://www.vim.org/)


0 comments on commit cc9cdd8

Please sign in to comment.