mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-06 19:48:43 +08:00
Merge branch 'recipe-correction' into 'master'
Remove resist from CI, older duplicate sd See merge request redox-os/redox!1886
This commit is contained in:
commit
b52145a8fa
@ -122,7 +122,6 @@ You can contribute to the Redox documentation and code on the following reposito
|
|||||||
- [Build System Configuration](https://gitlab.redox-os.org/redox-os/redox) - Our main repository
|
- [Build System Configuration](https://gitlab.redox-os.org/redox-os/redox) - Our main repository
|
||||||
- [Orbital](https://gitlab.redox-os.org/redox-os/orbital) - Display Server and Window Manager
|
- [Orbital](https://gitlab.redox-os.org/redox-os/orbital) - Display Server and Window Manager
|
||||||
- [pkgutils](https://gitlab.redox-os.org/redox-os/pkgutils) - Package Manager
|
- [pkgutils](https://gitlab.redox-os.org/redox-os/pkgutils) - Package Manager
|
||||||
- [resist](https://gitlab.redox-os.org/redox-os/resist) - Redox System Interface Specifications and Tests (also has POSIX tests)
|
|
||||||
- [acid](https://gitlab.redox-os.org/redox-os/acid) - Redox Test Suite
|
- [acid](https://gitlab.redox-os.org/redox-os/acid) - Redox Test Suite
|
||||||
- [relibc](https://gitlab.redox-os.org/redox-os/relibc) - Redox C Library
|
- [relibc](https://gitlab.redox-os.org/redox-os/relibc) - Redox C Library
|
||||||
- [libredox](https://gitlab.redox-os.org/redox-os/libredox) - Redox System Library
|
- [libredox](https://gitlab.redox-os.org/redox-os/libredox) - Redox System Library
|
||||||
|
|||||||
@ -87,7 +87,6 @@ pls = {}
|
|||||||
pop-icon-theme = {}
|
pop-icon-theme = {}
|
||||||
redoxfs = {}
|
redoxfs = {}
|
||||||
relibc = {}
|
relibc = {}
|
||||||
resist = {}
|
|
||||||
ripgrep = {}
|
ripgrep = {}
|
||||||
rustpython = {}
|
rustpython = {}
|
||||||
sdl1 = {}
|
sdl1 = {}
|
||||||
|
|||||||
@ -86,7 +86,6 @@ pop-icon-theme = {}
|
|||||||
pkgutils = {}
|
pkgutils = {}
|
||||||
redoxfs = {}
|
redoxfs = {}
|
||||||
relibc = {}
|
relibc = {}
|
||||||
resist = {}
|
|
||||||
ripgrep = {}
|
ripgrep = {}
|
||||||
rustpython = {}
|
rustpython = {}
|
||||||
sdl1 = {}
|
sdl1 = {}
|
||||||
|
|||||||
@ -86,7 +86,6 @@ pop-icon-theme = {}
|
|||||||
pkgutils = {}
|
pkgutils = {}
|
||||||
redoxfs = {}
|
redoxfs = {}
|
||||||
relibc = {}
|
relibc = {}
|
||||||
#resist = {} # Uses redox_syscall 0.2 which does not compile on riscv64gc
|
|
||||||
ripgrep = {}
|
ripgrep = {}
|
||||||
rustpython = {}
|
rustpython = {}
|
||||||
#sdl1 = {} # not tested yet, netsurf is commented out
|
#sdl1 = {} # not tested yet, netsurf is commented out
|
||||||
|
|||||||
@ -12,7 +12,6 @@ prompt = false
|
|||||||
# Package settings
|
# Package settings
|
||||||
[packages]
|
[packages]
|
||||||
acid = {}
|
acid = {}
|
||||||
resist = {}
|
|
||||||
relibc-tests = {}
|
relibc-tests = {}
|
||||||
os-test = {}
|
os-test = {}
|
||||||
openposixtestsuite = {}
|
openposixtestsuite = {}
|
||||||
|
|||||||
@ -166,7 +166,6 @@ redox-games = {}
|
|||||||
redoxfs = {}
|
redoxfs = {}
|
||||||
relibc = {}
|
relibc = {}
|
||||||
relibc-tests = {}
|
relibc-tests = {}
|
||||||
resist = {}
|
|
||||||
ripgrep = {}
|
ripgrep = {}
|
||||||
rodioplay = {}
|
rodioplay = {}
|
||||||
rs-nes = {}
|
rs-nes = {}
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"acid",
|
"acid",
|
||||||
"resist",
|
"os-test",
|
||||||
|
"redox-posix-tests",
|
||||||
"relibc-tests",
|
"relibc-tests",
|
||||||
]
|
]
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
#TODO relibc function not implemented
|
|
||||||
[source]
|
|
||||||
git = "https://github.com/chmln/sd.git"
|
|
||||||
[build]
|
|
||||||
template = "cargo"
|
|
||||||
Loading…
Reference in New Issue
Block a user