Compare commits

..

No commits in common. "3f154e09e2ae523823a5528a6e2e789bc9de6132" and "7696ec8badc9195c6a75b4089e37c2aef3b4a71a" have entirely different histories.

13 changed files with 21 additions and 9 deletions

@ -1 +1 @@
Subproject commit 0874fabe02d9a7d77a611c250a48dcfd568d36c6 Subproject commit 1dfe98efd52639589fc98d636f9b1ca4c8c67088

View File

@ -11,6 +11,7 @@ acid = {}
coreutils = {} coreutils = {}
ion = {} ion = {}
ipcd = {} ipcd = {}
logd = {}
ptyd = {} ptyd = {}
# User settings # User settings
@ -29,6 +30,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
""" """

View File

@ -74,6 +74,7 @@ ipcd = {}
#libpng = {} #libpng = {}
#libsodium = {} #libsodium = {}
#llvm = {} #llvm = {}
#logd = {}
#lua = {} #lua = {}
#mdp = {} #mdp = {}
#mesa = {} #mesa = {}
@ -178,6 +179,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
#logd
ptyd ptyd
#pcid /etc/pcid.d/ #pcid /etc/pcid.d/
""" """

View File

@ -21,6 +21,7 @@ gnu-make = {}
installer = {} installer = {}
ion = {} ion = {}
ipcd = {} ipcd = {}
logd = {}
netdb = {} netdb = {}
netstack = {} netstack = {}
netsurf = {} netsurf = {}
@ -55,6 +56,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
pcid /etc/pcid.d/ pcid /etc/pcid.d/
""" """

View File

@ -67,6 +67,7 @@ libsodium = {}
libvorbis = {} libvorbis = {}
libxml2 = {} libxml2 = {}
llvm = {} llvm = {}
logd = {}
mesa = {} mesa = {}
mesa_glu = {} mesa_glu = {}
nasm = {} nasm = {}
@ -105,7 +106,6 @@ resist = {}
ripgrep = {} ripgrep = {}
rodioplay = {} rodioplay = {}
rs-nes = {} rs-nes = {}
rust = {}
rust64 = {} rust64 = {}
rust-cairo = {} rust-cairo = {}
rust-cairo-demo = {} rust-cairo-demo = {}
@ -156,6 +156,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
pcid /etc/pcid.d/ pcid /etc/pcid.d/
""" """

View File

@ -82,7 +82,7 @@ libsodium = {}
libvorbis = {} libvorbis = {}
libxml2 = {} libxml2 = {}
llvm = {} llvm = {}
#logd = {} logd = {}
#lua = {} #lua = {}
#mdp = {} #mdp = {}
mesa = {} mesa = {}
@ -200,6 +200,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
pcid /etc/pcid.d/ pcid /etc/pcid.d/
""" """

View File

@ -74,6 +74,7 @@ ipcd = {}
#libpng = {} #libpng = {}
#libsodium = {} #libsodium = {}
#llvm = {} #llvm = {}
logd = {}
#lua = {} #lua = {}
#mdp = {} #mdp = {}
#mesa = {} #mesa = {}
@ -175,6 +176,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
""" """

View File

@ -17,6 +17,7 @@ gcc = {}
gnu-binutils = {} gnu-binutils = {}
gnu-make = {} gnu-make = {}
ipcd = {} ipcd = {}
logd = {}
netdb = {} netdb = {}
netstack = {} netstack = {}
netutils = {} netutils = {}
@ -41,6 +42,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
pcid /etc/pcid.d/ pcid /etc/pcid.d/
""" """

View File

@ -19,6 +19,7 @@ gnu-make = {}
installer = {} installer = {}
ion = {} ion = {}
ipcd = {} ipcd = {}
logd = {}
netdb = {} netdb = {}
netstack = {} netstack = {}
netutils = {} netutils = {}
@ -46,6 +47,7 @@ password = ""
path = "/etc/init.d/00_base" path = "/etc/init.d/00_base"
data = """ data = """
ipcd ipcd
logd
ptyd ptyd
pcid /etc/pcid.d/ pcid /etc/pcid.d/
""" """

View File

@ -9,7 +9,6 @@ prompt = false
[packages] [packages]
drivers = {} drivers = {}
init = {} init = {}
logd = {}
nulld = {} nulld = {}
#pciids = {} #pciids = {}
ramfs = {} ramfs = {}
@ -26,8 +25,7 @@ nulld
zerod zerod
randd randd
vesad T T G vesad T T G
logd debug: display:1 stdio display:1
stdio log:
ps2d us ps2d us
ramfs logging ramfs logging
acpid acpid

2
kernel

@ -1 +1 @@
Subproject commit 81e700708d901d6552c2cef242df505d93efbf4f Subproject commit 1aae949fc488b5a25f7a1204ddb958ff015eb290

View File

@ -1,4 +1,4 @@
INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid
build/initfs.tag: initfs.toml prefix build/initfs.tag: initfs.toml prefix
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release

View File

@ -36,7 +36,7 @@ ifeq ($(vga),no)
QEMUFLAGS+=-nographic -vga none QEMUFLAGS+=-nographic -vga none
endif endif
ifneq ($(usb),no) ifneq ($(usb),no)
QEMUFLAGS+=-device nec-usb-xhci,id=xhci QEMUFLAGS+=-device nec-usb-xhci,id=xhci -device usb-tablet,bus=xhci.0
endif endif
ifeq ($(gdb),yes) ifeq ($(gdb),yes)
QEMUFLAGS+=-s QEMUFLAGS+=-s