From ae1abca0f57254c3d809c482cf90af564a29b0dd Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jan 2017 19:35:44 -0700 Subject: [PATCH] Use only one virtual terminal until init issue is fixed. Compile baduk, do not compile snake until issue is fixed --- filesystem/etc/init.d/20_orbital | 1 + filesystem/etc/init.d/{20_console => 30_console} | 2 +- filesystem/etc/init.d/30_orbital | 1 - filesystem/etc/init.d/40_serial | 1 - initfs/etc/init.rc | 2 +- mk/userspace/games.mk | 6 ++++-- programs/games | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 filesystem/etc/init.d/20_orbital rename filesystem/etc/init.d/{20_console => 30_console} (50%) delete mode 100644 filesystem/etc/init.d/30_orbital delete mode 100644 filesystem/etc/init.d/40_serial diff --git a/filesystem/etc/init.d/20_orbital b/filesystem/etc/init.d/20_orbital new file mode 100644 index 0000000..583ebd1 --- /dev/null +++ b/filesystem/etc/init.d/20_orbital @@ -0,0 +1 @@ +/sbin/orbital display:3/activate /ui/bin/orblogin /ui/bin/launcher diff --git a/filesystem/etc/init.d/20_console b/filesystem/etc/init.d/30_console similarity index 50% rename from filesystem/etc/init.d/20_console rename to filesystem/etc/init.d/30_console index ca6aeb0..c981568 100644 --- a/filesystem/etc/init.d/20_console +++ b/filesystem/etc/init.d/30_console @@ -1,2 +1,2 @@ getty display:2 -getty display:3 +getty debug: -J diff --git a/filesystem/etc/init.d/30_orbital b/filesystem/etc/init.d/30_orbital deleted file mode 100644 index b1e505b..0000000 --- a/filesystem/etc/init.d/30_orbital +++ /dev/null @@ -1 +0,0 @@ -/sbin/orbital display:4/activate /ui/bin/orblogin /ui/bin/launcher diff --git a/filesystem/etc/init.d/40_serial b/filesystem/etc/init.d/40_serial deleted file mode 100644 index 730fa10..0000000 --- a/filesystem/etc/init.d/40_serial +++ /dev/null @@ -1 +0,0 @@ -getty debug: -J diff --git a/initfs/etc/init.rc b/initfs/etc/init.rc index 97b35c2..bd7548b 100644 --- a/initfs/etc/init.rc +++ b/initfs/etc/init.rc @@ -1,5 +1,5 @@ export PATH initfs:/bin -vesad T T T G +vesad T T G stdio display:1 ps2d pcid /etc/pcid.toml diff --git a/mk/userspace/games.mk b/mk/userspace/games.mk index ae0dda7..e65b00a 100644 --- a/mk/userspace/games.mk +++ b/mk/userspace/games.mk @@ -1,9 +1,11 @@ games: \ + filesystem/bin/baduk \ filesystem/bin/ice \ filesystem/bin/minesweeper \ filesystem/bin/reblox \ - filesystem/bin/rusthello \ - filesystem/bin/snake + filesystem/bin/rusthello + +#filesystem/bin/snake filesystem/bin/%: programs/games/Cargo.toml programs/games/src/%/**.rs $(BUILD)/libstd.rlib mkdir -p filesystem/bin diff --git a/programs/games b/programs/games index 3478af8..c4984dc 160000 --- a/programs/games +++ b/programs/games @@ -1 +1 @@ -Subproject commit 3478af86d9bb413dc918ead3029eff65bf44e099 +Subproject commit c4984dc276bf5776f544b5f9f6996330e3ca4b51