Skip to content

Commit 69c2dbf

Browse files
authored
Merge pull request #2167 from includeos/dev
Merge dev to master
2 parents d6a1586 + 944d072 commit 69c2dbf

1,189 files changed

Lines changed: 25660 additions & 55643 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 0 additions & 108 deletions
This file was deleted.

.dockerignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ massif.out.*
3131
build/
3232
build_i686/
3333
build_x86_64/
34+
build_conan/
3435

3536
# ignore log files in test tree
3637
test/**/*.log
@@ -51,3 +52,6 @@ IncludeOS_install
5152

5253
# Starbase disk file
5354
lib/uplink/starbase/disk
55+
56+
!Jenkinsfile
57+
!CHANGELOG

.gitmodules

Lines changed: 0 additions & 28 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Changelog
2+
<!--
3+
Please categorize a release with the following headings: Added, Changed, Deprecated, Removed, Fixed, Security
4+
Guidelines taken from: https://keepachangelog.com/en/1.0.0/
5+
-->
6+
7+
## [unreleased]
8+
9+
### Added
10+
- Experimental IPv6 (WIP) including SLAAC
11+
- Now supported with config.json - see [#2114](https://github.com/includeos/IncludeOS/pull/2114)
12+
- HAL (work in progress)
13+
- The OS is now backed by a common Machine structure that makes it easier to create new ports
14+
- There is now a hidden kernel namespace and a user-facing os namespace
15+
- Conan build system
16+
- Major refactoring of how IncludeOS is built
17+
- Multiple ARCH is managed by Conan profiles and dependencies
18+
- 3rd party dependencies are now built and managed in Jenkins. All recipes can be found [here](https://github.com/includeos/conan)
19+
- Updated to libcxx, libcxxabi 7.0.1
20+
- Updated to GSL 2.0.0
21+
- Stable and latest binary packages can be found in [bintray](https://bintray.com/includeos/includeos)
22+
- A repo to install Conan configs for IncludeOS: [conan_config](https://github.com/includeos/conan_config)
23+
- Improvements to Jenkins integration, automatic uploads of latest/stable packages on master-merge/tags
24+
25+
### Changed
26+
- Updates to workflow. All documented in the [README](README.md)
27+
- No more need for `INCLUDEOS_PREFIX` in env variables
28+
- Removed ARCH as part of the path to libraries/drivers/plugins/etc
29+
- Drivers and Plugins can be created outside includeos
30+
- Moved IncludeOS repository from `hioa-cs` to `includeos` organization
31+
32+
### Removed
33+
- Cleanup of unused/outdated scripts
34+
- `install.sh` is gone as it does no longer work with the Conan workflow
35+
- Relocated plugins/libraries/scripts:
36+
- [Hello World example](https://github.com/includeos/hello_world)
37+
- [Demos and examples](https://github.com/includeos/demo-examples)
38+
- [Mana](https://github.com/includeos/mana)
39+
- [Uplink](https://github.com/includeos/uplink)
40+
- [Vmrunner](https://github.com/includeos/vmrunner)
41+
- [Diskbuilder](https://github.com/includeos/diskbuilder)
42+
- [Vmbuild](https://github.com/includeos/vmbuild)
43+
- [MicroLB](https://github.com/includeos/microlb)

0 commit comments

Comments
 (0)