From 00592767412dae63682d6c5d7e5c96cba73e8f4e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 7 Apr 2017 21:25:16 -0600 Subject: [PATCH] Do not include games or binutils by default --- .gitmodules | 6 ------ Cargo.toml | 2 -- mk/userspace/binutils.mk | 9 --------- mk/userspace/games.mk | 13 ------------- mk/userspace/mod.mk | 4 ---- programs/binutils | 1 - programs/games | 1 - 7 files changed, 36 deletions(-) delete mode 100644 mk/userspace/binutils.mk delete mode 100644 mk/userspace/games.mk delete mode 160000 programs/binutils delete mode 160000 programs/games diff --git a/.gitmodules b/.gitmodules index 8d3eafd..4530000 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,15 +46,9 @@ [submodule "docgen"] path = docgen url = https://github.com/redox-os/docgen.git -[submodule "programs/binutils"] - path = programs/binutils - url = https://github.com/redox-os/binutils.git [submodule "libc-artifacts"] path = libc-artifacts url = https://github.com/redox-os/libc-artifacts.git -[submodule "programs/games"] - path = programs/games - url = https://github.com/redox-os/games.git [submodule "kernel"] path = kernel url = https://github.com/redox-os/kernel.git diff --git a/Cargo.toml b/Cargo.toml index 8ec8394..5888ed1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,11 +14,9 @@ members = [ "installer", "kernel", "programs/acid", - "programs/binutils", "programs/contain", "programs/coreutils", "programs/extrautils", - "programs/games", "programs/init", "programs/ion", "programs/netutils", diff --git a/mk/userspace/binutils.mk b/mk/userspace/binutils.mk deleted file mode 100644 index 0a25ab4..0000000 --- a/mk/userspace/binutils.mk +++ /dev/null @@ -1,9 +0,0 @@ -binutils: \ - filesystem/bin/hex \ - filesystem/bin/hexdump \ - filesystem/bin/strings - -filesystem/bin/%: programs/binutils/Cargo.toml programs/binutils/src/bin/%.rs $(BUILD)/libstd.rlib - mkdir -p filesystem/bin - $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ - $(STRIP) $@ diff --git a/mk/userspace/games.mk b/mk/userspace/games.mk deleted file mode 100644 index e65b00a..0000000 --- a/mk/userspace/games.mk +++ /dev/null @@ -1,13 +0,0 @@ -games: \ - filesystem/bin/baduk \ - filesystem/bin/ice \ - filesystem/bin/minesweeper \ - filesystem/bin/reblox \ - filesystem/bin/rusthello - -#filesystem/bin/snake - -filesystem/bin/%: programs/games/Cargo.toml programs/games/src/%/**.rs $(BUILD)/libstd.rlib - mkdir -p filesystem/bin - $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ - $(STRIP) $@ diff --git a/mk/userspace/mod.mk b/mk/userspace/mod.mk index 2d6fc28..80b6612 100644 --- a/mk/userspace/mod.mk +++ b/mk/userspace/mod.mk @@ -2,7 +2,6 @@ userspace: \ drivers \ coreutils \ extrautils \ - games \ installer \ ion \ netutils \ @@ -12,15 +11,12 @@ userspace: \ schemes \ filesystem/bin/acid \ filesystem/bin/contain \ - filesystem/bin/redox_installer \ filesystem/bin/smith \ filesystem/bin/tar -include mk/userspace/binutils.mk include mk/userspace/coreutils.mk include mk/userspace/drivers.mk include mk/userspace/extrautils.mk -include mk/userspace/games.mk include mk/userspace/installer.mk include mk/userspace/ion.mk include mk/userspace/netutils.mk diff --git a/programs/binutils b/programs/binutils deleted file mode 160000 index ce057ba..0000000 --- a/programs/binutils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ce057bac70f18fe7fd004c68e58c07c1cc7174e0 diff --git a/programs/games b/programs/games deleted file mode 160000 index c4984dc..0000000 --- a/programs/games +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4984dc276bf5776f544b5f9f6996330e3ca4b51