Compare commits

...

7 Commits

5 changed files with 21 additions and 24 deletions

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ arch/mksh/
sys/src/9/port/error.h
sys/src/9/root/nvram
sys/src/kern/amd64/ramdisk
*.orig
*_orig

View File

@ -1,6 +1,3 @@
[![Build Status](https://api.travis-ci.org/JehanneOS/jehanne.svg?branch=master)](https://travis-ci.org/JehanneOS/jehanne)
[![Coverity Badge](https://scan.coverity.com/projects/7364/badge.svg)](https://scan.coverity.com/projects/jehanne)
# Jehanne
Jehanne is a [simple][simplicity] operating system.
@ -10,7 +7,7 @@ Jehanne has noble ancestors:
- most of userland tools, a lot of wisdom and some kernel modules,
come from [9front][9front]
- the kernel is a fork of Charles Forsyth's [Plan9-9k][plan9-9k]
- most of the build system and some valuable piece of code come from [Harvey OS][harvey]
- ~~most of the build system and~~ some valuable piece of code come from [Harvey OS][harvey]
Still the project is named after a humble peasant,
the famous French heretic [Joan of Arc][arc], because it diverges deeply
@ -48,11 +45,11 @@ The running system also includes supplemental folders like `/lib`,
## Build
To build Jehanne and play with it, you need to have git, golang, qemu,
To build Jehanne and play with it, you need to have git, qemu,
gcc, binutils and bison installed.
For example on Debian GNU/Linux 10 you should be able to get going with
sudo apt-get install git golang build-essential flex bison qemu-system autoconf autoconf-archive curl automake-1.15
sudo apt-get install libxt-dev libtool-bin git build-essential flex bison qemu-system autoconf autoconf-archive curl automake
After the repository clone, you can give a look with
@ -65,18 +62,24 @@ After the repository clone, you can give a look with
## Hacking
Jehanne is a work in progress.
Forks and pull requests are welcome.
Jehanne is a work in progress.
The limited amount of time that I can dedicate to its development and the
[pending licensing issues](http://jehanne.h--k.it/2022/01/06/jehanne_is_moving.html#leaving-github) made me
realize that Jehanne is really a **personal** Research OS, as it was correctly defined,
years ago, by [Aiju](https://aiju.de/about_me/).
So I decided to adopt the [contribution strategy](https://github.com/klange/toaruos#are-contributions-accepted)
of a more mature OS, like [TuaruOS](https://toaruos.org/) is: contributions in the form of code should be discussed in advance.
Feel free to [reach me on the Fediverse](https://qoto.org/@Shamar)!
However, if you really want to contribute to Jehanne, my suggestion is to contribute to [9front](https://9front.org) first:
9front is the most mature and stable among Plan 9's evolutions, it's developed by great hackers with a [great sense of humor](https://fqa.9front.org/fqa0.html#0.1). :-D
Contributing to 9front will be much more fun and formative than contributing to Jehanne, and I will happily port your code when ready.
In [doc/hacking](./doc/hacking/) you will find all you
need to know about its principles, design and weirdness.
There's a lot of work to do, in every area of the system.
To coordinate our efforts, we use the github issues.
To discuss (and even debate) about the design and development of Jehanne
we use the [JehanneOS mailing list][mailinglist]: please join and present
yourself and your attitudes.
[simplicity]: http://plato.stanford.edu/entries/simplicity/ "What is simplicity?"
[harvey]: http://harvey-os.org "Harvey OS"
@ -85,5 +88,5 @@ yourself and your attitudes.
[nix]: https://github.com/rminnich/nix-os
[arc]: https://en.wikipedia.org/wiki/Joan_of_Arc "Jeanne d'Arc"
[lic]: ./LICENSE.md "A summary of Jehanne licensing"
[mailinglist]: https://groups.google.com/forum/#!forum/jehanneos

View File

@ -1,10 +1,3 @@
#!/cmd/rc
# sed -n \
# -e '/#{{/{x; /^$/{x;b}; s/''/''''/g; s/\$[$a-zA-Z0-9()#"]\+[\^]\?/''&''/g; s/^\n/echo ''/ ; s/$/''/; p; x; h; b}' \
# -e H \
# -e '/#}}/{s/#}}//; x; s/#{{//; s/#}}//; p; g}' \
# -e '${x; /^$/{b}; /#}}/!{s/''/''''/g; s/\$[$a-zA-Z0-9()#"]\+[\^]\?/''&''/g; s/^\n/echo ''/ ; s/$/''/; p}}' \
# | rc
sed '/^$/{s//echo/; b}; /^#! /{s/#! //g; b}; /^#! /!{s/''/''''/g; s/\$\(#\|"\)\?[$a-zA-Z0-9_]\+\(([$a-zA-Z0-9#_]\+)\)\?[\^]\?/''&''/g; s/^/echo ''/ ; s/$/''/; b}'

@ -1 +1 @@
Subproject commit 5ea07be6994bac967a282f30d2c87bf37875a1ff
Subproject commit cb38e778ee5905884af4cbf5aca346e469c24d7a

Binary file not shown.