Convert to cookbook based build
This commit is contained in:
Jeremy Soller
parent
9034701e8f
commit
c9950beec2
117 changed files with 246 additions and 6591 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -1,6 +1 @@
|
||||||
build
|
build
|
||||||
target
|
|
||||||
initfs/bin
|
|
||||||
filesystem/bin
|
|
||||||
filesystem/ref
|
|
||||||
filesystem/sbin
|
|
||||||
|
|
|
||||||
129
.gitmodules
vendored
129
.gitmodules
vendored
|
|
@ -1,123 +1,18 @@
|
||||||
[submodule "rust"]
|
|
||||||
path = rust
|
|
||||||
url = https://github.com/redox-os/rust.git
|
|
||||||
[submodule "ion"]
|
|
||||||
path = programs/ion
|
|
||||||
url = https://github.com/redox-os/ion.git
|
|
||||||
[submodule "programs/coreutils"]
|
|
||||||
path = programs/coreutils
|
|
||||||
url = https://github.com/redox-os/coreutils.git
|
|
||||||
[submodule "schemes/redoxfs"]
|
|
||||||
path = schemes/redoxfs
|
|
||||||
url = https://github.com/redox-os/redoxfs
|
|
||||||
[submodule "programs/extrautils"]
|
|
||||||
path = programs/extrautils
|
|
||||||
url = https://github.com/redox-os/extrautils.git
|
|
||||||
[submodule "programs/smith"]
|
|
||||||
path = programs/smith
|
|
||||||
url = https://github.com/IGI-111/Smith.git
|
|
||||||
[submodule "programs/userutils"]
|
|
||||||
path = programs/userutils
|
|
||||||
url = https://github.com/redox-os/userutils.git
|
|
||||||
[submodule "programs/netutils"]
|
|
||||||
path = programs/netutils
|
|
||||||
url = https://github.com/redox-os/netutils.git
|
|
||||||
[submodule "schemes/orbital"]
|
|
||||||
path = schemes/orbital
|
|
||||||
url = https://github.com/redox-os/orbital.git
|
|
||||||
[submodule "programs/orbutils"]
|
|
||||||
path = programs/orbutils
|
|
||||||
url = https://github.com/redox-os/orbutils.git
|
|
||||||
[submodule "filesystem/ui"]
|
|
||||||
path = filesystem/ui
|
|
||||||
url = https://github.com/redox-os/orbdata.git
|
|
||||||
[submodule "programs/acid"]
|
|
||||||
path = programs/acid
|
|
||||||
url = https://github.com/redox-os/acid.git
|
|
||||||
[submodule "programs/pkgutils"]
|
|
||||||
path = programs/pkgutils
|
|
||||||
url = https://github.com/redox-os/pkgutils.git
|
|
||||||
[submodule "installer"]
|
|
||||||
path = installer
|
|
||||||
url = https://github.com/redox-os/installer.git
|
|
||||||
[submodule "docgen"]
|
|
||||||
path = docgen
|
|
||||||
url = https://github.com/redox-os/docgen.git
|
|
||||||
[submodule "libc-artifacts"]
|
|
||||||
path = libc-artifacts
|
|
||||||
url = https://github.com/redox-os/libc-artifacts.git
|
|
||||||
[submodule "kernel"]
|
|
||||||
path = kernel
|
|
||||||
url = https://github.com/redox-os/kernel.git
|
|
||||||
[submodule "drivers"]
|
|
||||||
path = drivers
|
|
||||||
url = https://github.com/redox-os/drivers.git
|
|
||||||
[submodule "bootloader"]
|
[submodule "bootloader"]
|
||||||
path = bootloader
|
path = bootloader
|
||||||
url = https://github.com/redox-os/bootloader.git
|
url = https://github.com/redox-os/bootloader.git
|
||||||
[submodule "isolinux"]
|
|
||||||
path = isolinux
|
|
||||||
url = https://github.com/redox-os/isolinux.git
|
|
||||||
[submodule "programs/init"]
|
|
||||||
path = programs/init
|
|
||||||
url = https://github.com/redox-os/init.git
|
|
||||||
[submodule "libs/orbclient"]
|
|
||||||
path = libs/orbclient
|
|
||||||
url = https://github.com/redox-os/orbclient.git
|
|
||||||
[submodule "libs/orbtk"]
|
|
||||||
path = libs/orbtk
|
|
||||||
url = https://github.com/redox-os/orbtk.git
|
|
||||||
[submodule "libs/orbimage"]
|
|
||||||
path = libs/orbimage
|
|
||||||
url = https://github.com/redox-os/orbimage.git
|
|
||||||
[submodule "libs/orbfont"]
|
|
||||||
path = libs/orbfont
|
|
||||||
url = https://github.com/redox-os/orbfont.git
|
|
||||||
[submodule "libs/jpeg-decoder"]
|
|
||||||
path = libs/jpeg-decoder
|
|
||||||
url = https://github.com/redox-os/jpeg-decoder.git
|
|
||||||
[submodule "libs/termion"]
|
|
||||||
path = libs/termion
|
|
||||||
url = https://github.com/redox-os/termion.git
|
|
||||||
[submodule "libs/syscall"]
|
|
||||||
path = libs/syscall
|
|
||||||
url = https://github.com/redox-os/syscall.git
|
|
||||||
[submodule "libs/extra"]
|
|
||||||
path = libs/extra
|
|
||||||
url = https://github.com/redox-os/libextra.git
|
|
||||||
[submodule "libs/event"]
|
|
||||||
path = libs/event
|
|
||||||
url = https://github.com/redox-os/event.git
|
|
||||||
[submodule "libs/pager"]
|
|
||||||
path = libs/pager
|
|
||||||
url = https://github.com/redox-os/libpager.git
|
|
||||||
[submodule "libs/ransid"]
|
|
||||||
path = libs/ransid
|
|
||||||
url = https://github.com/redox-os/ransid.git
|
|
||||||
[submodule "libs/same-file"]
|
|
||||||
path = libs/same-file
|
|
||||||
url = https://github.com/redox-os/same-file.git
|
|
||||||
[submodule "libs/mio"]
|
|
||||||
path = libs/mio
|
|
||||||
url = https://github.com/redox-os/mio.git
|
|
||||||
[submodule "programs/binutils"]
|
|
||||||
path = programs/binutils
|
|
||||||
url = https://github.com/redox-os/binutils.git
|
|
||||||
[submodule "programs/games"]
|
|
||||||
path = programs/games
|
|
||||||
url = https://github.com/redox-os/games.git
|
|
||||||
[submodule "programs/sodium"]
|
|
||||||
path = programs/sodium
|
|
||||||
url = https://github.com/redox-os/sodium.git
|
|
||||||
[submodule "libs/ralloc"]
|
|
||||||
path = libs/ralloc
|
|
||||||
url = https://github.com/redox-os/ralloc.git
|
|
||||||
[submodule "libs/tar"]
|
|
||||||
path = libs/tar
|
|
||||||
url = https://github.com/redox-os/tar-rs.git
|
|
||||||
[submodule "programs/orbterm"]
|
|
||||||
path = programs/orbterm
|
|
||||||
url = https://github.com/redox-os/orbterm.git
|
|
||||||
[submodule "cookbook"]
|
[submodule "cookbook"]
|
||||||
path = cookbook
|
path = cookbook
|
||||||
url = https://github.com/redox-os/cookbook.git
|
url = https://github.com/redox-os/cookbook.git
|
||||||
|
[submodule "installer"]
|
||||||
|
path = installer
|
||||||
|
url = https://github.com/redox-os/installer.git
|
||||||
|
[submodule "isolinux"]
|
||||||
|
path = isolinux
|
||||||
|
url = https://github.com/redox-os/isolinux.git
|
||||||
|
[submodule "kernel"]
|
||||||
|
path = kernel
|
||||||
|
url = https://github.com/redox-os/kernel.git
|
||||||
|
[submodule "rust"]
|
||||||
|
path = rust
|
||||||
|
url = https://github.com/redox-os/rust.git
|
||||||
|
|
|
||||||
2365
Cargo.lock
generated
2365
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
74
Cargo.toml
74
Cargo.toml
|
|
@ -1,74 +0,0 @@
|
||||||
[workspace]
|
|
||||||
exclude = ["cookbook"]
|
|
||||||
members = [
|
|
||||||
"docgen",
|
|
||||||
"drivers/ahcid",
|
|
||||||
"drivers/alxd",
|
|
||||||
"drivers/bgad",
|
|
||||||
"drivers/e1000d",
|
|
||||||
"drivers/nvmed",
|
|
||||||
"drivers/pcid",
|
|
||||||
"drivers/ps2d",
|
|
||||||
"drivers/rtl8168d",
|
|
||||||
"drivers/vboxd",
|
|
||||||
"drivers/vesad",
|
|
||||||
"drivers/xhcid",
|
|
||||||
"installer",
|
|
||||||
"kernel",
|
|
||||||
"libs/event",
|
|
||||||
"libs/extra",
|
|
||||||
"libs/jpeg-decoder",
|
|
||||||
"libs/mio",
|
|
||||||
"libs/orbclient",
|
|
||||||
"libs/orbfont",
|
|
||||||
"libs/orbimage",
|
|
||||||
"libs/orbtk",
|
|
||||||
"libs/pager",
|
|
||||||
#TODO "libs/ralloc",
|
|
||||||
"libs/ransid",
|
|
||||||
"libs/same-file",
|
|
||||||
"libs/syscall",
|
|
||||||
"libs/tar",
|
|
||||||
"libs/termion",
|
|
||||||
"programs/acid",
|
|
||||||
"programs/binutils",
|
|
||||||
"programs/contain",
|
|
||||||
"programs/coreutils",
|
|
||||||
"programs/extrautils",
|
|
||||||
"programs/games",
|
|
||||||
"programs/init",
|
|
||||||
"programs/ion",
|
|
||||||
"programs/netutils",
|
|
||||||
"programs/orbterm",
|
|
||||||
"programs/orbutils",
|
|
||||||
"programs/pkgutils",
|
|
||||||
"programs/smith",
|
|
||||||
"programs/sodium",
|
|
||||||
"programs/timeout",
|
|
||||||
"programs/userutils",
|
|
||||||
"schemes/ethernetd",
|
|
||||||
"schemes/ipd",
|
|
||||||
"schemes/orbital",
|
|
||||||
"schemes/ptyd",
|
|
||||||
"schemes/randd",
|
|
||||||
"schemes/redoxfs",
|
|
||||||
"schemes/tcpd",
|
|
||||||
"schemes/udpd"
|
|
||||||
]
|
|
||||||
|
|
||||||
[replace]
|
|
||||||
"extra:0.1.0" = { path = "libs/extra" }
|
|
||||||
"jpeg-decoder:0.1.12" = { path = "libs/jpeg-decoder" }
|
|
||||||
"mio:0.6.2" = { path = "libs/mio" }
|
|
||||||
"orbclient:0.3.4" = { path = "libs/orbclient" }
|
|
||||||
"orbfont:0.1.8" = { path = "libs/orbfont" }
|
|
||||||
"orbimage:0.1.15" = { path = "libs/orbimage" }
|
|
||||||
"orbtk:0.2.19" = { path = "libs/orbtk" }
|
|
||||||
"pager:0.1.0" = { path = "libs/pager" }
|
|
||||||
"ralloc:1.0.0" = { path = "libs/ralloc" }
|
|
||||||
"ransid:0.2.7" = { path = "libs/ransid" }
|
|
||||||
"redox_event:0.1.0" = { path = "libs/event" }
|
|
||||||
"redox_syscall:0.1.17" = { path = "libs/syscall" }
|
|
||||||
"same-file:0.1.2" = { path = "libs/same-file" }
|
|
||||||
"tar:0.4.11" = { path = "libs/tar" }
|
|
||||||
"termion:1.3.0" = { path = "libs/termion" }
|
|
||||||
12
Makefile
12
Makefile
|
|
@ -8,12 +8,8 @@ live: build/livedisk.bin
|
||||||
iso: build/livedisk.iso
|
iso: build/livedisk.iso
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
cargo clean
|
cargo clean --manifest-path kernel/Cargo.toml
|
||||||
cargo clean --manifest-path rust/src/libcollections/Cargo.toml
|
|
||||||
cargo clean --manifest-path rust/src/libstd/Cargo.toml
|
|
||||||
-$(FUMOUNT) build/filesystem/ || true
|
-$(FUMOUNT) build/filesystem/ || true
|
||||||
rm -rf initfs/bin
|
|
||||||
rm -rf filesystem/bin filesystem/sbin filesystem/ui/bin
|
|
||||||
rm -rf build
|
rm -rf build
|
||||||
|
|
||||||
update:
|
update:
|
||||||
|
|
@ -35,12 +31,6 @@ include mk/virtualbox.mk
|
||||||
# Kernel recipes
|
# Kernel recipes
|
||||||
include mk/kernel.mk
|
include mk/kernel.mk
|
||||||
|
|
||||||
# Userspace recipes
|
|
||||||
include mk/userspace/mod.mk
|
|
||||||
|
|
||||||
# Documentation
|
|
||||||
include mk/doc.mk
|
|
||||||
|
|
||||||
# Filesystem recipes
|
# Filesystem recipes
|
||||||
include mk/initfs.mk
|
include mk/initfs.mk
|
||||||
include mk/filesystem.mk
|
include mk/filesystem.mk
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5e5e080d618db036c632e096bdf6ce5c77b33bae
|
Subproject commit 787f0184fa96a227e51a7ce083a29b06f8945fd8
|
||||||
2
cookbook
2
cookbook
|
|
@ -1 +1 @@
|
||||||
Subproject commit 4a18e61514133017e31d67d31931b1bee621f0c2
|
Subproject commit 0506e3602e7e59de94a0e6c200d9aef82fe8e82c
|
||||||
1
docgen
1
docgen
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 52fb8863efdd0862b2439f87faff2457b43cac62
|
|
||||||
1
drivers
1
drivers
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 15675ea9c3de8b552743f83ec2f9a7bbba538c15
|
|
||||||
175
filesystem.toml
Normal file
175
filesystem.toml
Normal file
|
|
@ -0,0 +1,175 @@
|
||||||
|
# This is the default configuration file
|
||||||
|
|
||||||
|
# General settings
|
||||||
|
[general]
|
||||||
|
# Do not prompt if settings are not defined
|
||||||
|
prompt = false
|
||||||
|
sysroot = "build/filesystem"
|
||||||
|
|
||||||
|
# Package settings
|
||||||
|
[packages]
|
||||||
|
acid = {}
|
||||||
|
binutils = {}
|
||||||
|
contain = {}
|
||||||
|
coreutils = {}
|
||||||
|
drivers = {}
|
||||||
|
extrautils = {}
|
||||||
|
games = {}
|
||||||
|
init = {}
|
||||||
|
installer = {}
|
||||||
|
ion = {}
|
||||||
|
lua = {}
|
||||||
|
netstack = {}
|
||||||
|
netutils = {}
|
||||||
|
orbdata = {}
|
||||||
|
orbital = {}
|
||||||
|
orbterm = {}
|
||||||
|
orbutils = {}
|
||||||
|
#pixelcannon = {}
|
||||||
|
pkgutils = {}
|
||||||
|
ptyd = {}
|
||||||
|
randd = {}
|
||||||
|
redoxfs = {}
|
||||||
|
smith = {}
|
||||||
|
#sodium = {}
|
||||||
|
userutils = {}
|
||||||
|
|
||||||
|
# User settings
|
||||||
|
[users.root]
|
||||||
|
# Password is set to "password"
|
||||||
|
password = "$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk"
|
||||||
|
uid = 0
|
||||||
|
gid = 0
|
||||||
|
name = "root"
|
||||||
|
home = "/root"
|
||||||
|
|
||||||
|
[users.user]
|
||||||
|
# Password is unset
|
||||||
|
password = ""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/init.d/00_base"
|
||||||
|
data = """
|
||||||
|
randd
|
||||||
|
ptyd
|
||||||
|
pcid /etc/pcid.toml
|
||||||
|
"""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/init.d/10_net"
|
||||||
|
data = """
|
||||||
|
ethernetd
|
||||||
|
ipd
|
||||||
|
tcpd
|
||||||
|
udpd
|
||||||
|
dhcpd -b
|
||||||
|
"""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/init.d/20_orbital"
|
||||||
|
data = """
|
||||||
|
orbital display:3/activate /ui/bin/orblogin /ui/bin/launcher
|
||||||
|
"""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/init.d/30_console"
|
||||||
|
data = """
|
||||||
|
getty display:2
|
||||||
|
getty debug: -J
|
||||||
|
"""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/net/dns"
|
||||||
|
data = "208.67.222.222"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/net/ip"
|
||||||
|
data = "10.0.2.15"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/net/ip_router"
|
||||||
|
data = "10.0.2.2"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/net/ip_subnet"
|
||||||
|
data = "255.255.255.0"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/net/mac"
|
||||||
|
data = "00.00.00.00.00.00"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/pkg.d/50_redox"
|
||||||
|
data = "https://static.redox-os.org/pkg"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/group"
|
||||||
|
data = "sudo;1;user"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/hostname"
|
||||||
|
data = "redox"
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/issue"
|
||||||
|
data = """
|
||||||
|
########## Redox OS ##########
|
||||||
|
# Login with the following: #
|
||||||
|
# `user` #
|
||||||
|
# `root`:`password` #
|
||||||
|
##############################
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/motd"
|
||||||
|
data = """
|
||||||
|
Welcome to Redox OS!
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
[[files]]
|
||||||
|
path = "/etc/pcid.toml"
|
||||||
|
data = """
|
||||||
|
[[drivers]]
|
||||||
|
name = "82543GC NIC"
|
||||||
|
class = 2
|
||||||
|
vendor = 32902
|
||||||
|
device = 4100
|
||||||
|
command = ["e1000d", "$NAME", "$BAR0", "$IRQ"]
|
||||||
|
|
||||||
|
[[drivers]]
|
||||||
|
name = "82540EM NIC"
|
||||||
|
class = 2
|
||||||
|
vendor = 32902
|
||||||
|
device = 4110
|
||||||
|
command = ["e1000d", "$NAME", "$BAR0", "$IRQ"]
|
||||||
|
|
||||||
|
[[drivers]]
|
||||||
|
name = "82545EM NIC"
|
||||||
|
class = 2
|
||||||
|
vendor = 32902
|
||||||
|
device = 4111
|
||||||
|
command = ["e1000d", "$NAME", "$BAR0", "$IRQ"]
|
||||||
|
|
||||||
|
[[drivers]]
|
||||||
|
name = "82579V NIC"
|
||||||
|
class = 2
|
||||||
|
vendor = 32902
|
||||||
|
device = 5379
|
||||||
|
command = ["e1000d", "$NAME", "$BAR0", "$IRQ"]
|
||||||
|
|
||||||
|
[[drivers]]
|
||||||
|
name = "RTL8168 NIC"
|
||||||
|
class = 2
|
||||||
|
vendor = 4332
|
||||||
|
device = 33128
|
||||||
|
command = ["rtl8168d", "$NAME", "$BAR2", "$IRQ"]
|
||||||
|
|
||||||
|
[[drivers]]
|
||||||
|
name = "XHCI"
|
||||||
|
class = 12
|
||||||
|
subclass = 3
|
||||||
|
interface = 48
|
||||||
|
command = ["xhcid", "$NAME", "$BAR0", "$IRQ"]
|
||||||
|
"""
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
sudo;1;user
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
redox
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
/sbin/randd
|
|
||||||
/sbin/ptyd
|
|
||||||
/sbin/pcid /etc/pcid.toml
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
/sbin/ethernetd
|
|
||||||
/sbin/ipd
|
|
||||||
/sbin/tcpd
|
|
||||||
/sbin/udpd
|
|
||||||
dhcpd -b
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
/sbin/orbital display:3/activate /ui/bin/orblogin /ui/bin/launcher
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
getty display:2
|
|
||||||
getty debug: -J
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
# This is the default configuration file
|
|
||||||
|
|
||||||
# General settings
|
|
||||||
[general]
|
|
||||||
# Do not prompt if settings are not defined
|
|
||||||
prompt = false
|
|
||||||
|
|
||||||
# Package settings
|
|
||||||
[packages]
|
|
||||||
coreutils = {}
|
|
||||||
extrautils = {}
|
|
||||||
ion = {}
|
|
||||||
netutils = {}
|
|
||||||
pkgutils = {}
|
|
||||||
tar = {}
|
|
||||||
userutils = {}
|
|
||||||
|
|
||||||
[[files]]
|
|
||||||
path = "/etc/net/dns"
|
|
||||||
data = "208.67.222.222"
|
|
||||||
|
|
||||||
[[files]]
|
|
||||||
path = "/etc/net/ip"
|
|
||||||
data = "10.0.2.15"
|
|
||||||
|
|
||||||
[[files]]
|
|
||||||
path = "/etc/net/ip_router"
|
|
||||||
data = "10.0.2.2"
|
|
||||||
|
|
||||||
[[files]]
|
|
||||||
path = "/etc/net/ip_subnet"
|
|
||||||
data = "255.255.255.0"
|
|
||||||
|
|
||||||
[[files]]
|
|
||||||
path = "/etc/pkg.d/50_redox"
|
|
||||||
data = "https://static.redox-os.org/pkg"
|
|
||||||
|
|
||||||
# User settings
|
|
||||||
[users.root]
|
|
||||||
# Password is set to "password"
|
|
||||||
password = "$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk"
|
|
||||||
uid = 0
|
|
||||||
gid = 0
|
|
||||||
name = "root"
|
|
||||||
home = "/root"
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
########## Redox OS ##########
|
|
||||||
# Login with the following: #
|
|
||||||
# `user` #
|
|
||||||
# `root`:`password` #
|
|
||||||
##############################
|
|
||||||
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
Welcome to Redox OS!
|
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
208.67.222.222
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue