From d5783984370fc5fe67bfc980bed8a1c54cd0655e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 21 Apr 2019 16:43:28 -0600 Subject: [PATCH 01/26] Switch to Rust with Redox as a unix platform --- .gitmodules | 3 ++- relibc | 2 +- rust | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a72df0c..ba9d015 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,7 +25,7 @@ [submodule "rust"] path = rust url = https://gitlab.redox-os.org/redox-os/rust.git - branch = redox-2019-04-06 + branch = redox-unix-2019-04-06 [submodule "redoxfs"] path = redoxfs url = https://gitlab.redox-os.org/redox-os/redoxfs.git @@ -37,3 +37,4 @@ [submodule "bootloader-coreboot"] path = bootloader-coreboot url = https://gitlab.redox-os.org/redox-os/bootloader-coreboot.git + branch = master diff --git a/relibc b/relibc index 83f8991..7bde036 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 83f89912e0f9e9e2b62743b1a3d9080ada280a52 +Subproject commit 7bde03603149c70d85d6986f278853db90a58878 diff --git a/rust b/rust index c46c28a..debbcb0 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit c46c28ab856b9142c6883a02d77314dc2ebcb0ce +Subproject commit debbcb0ed621aa3904e0ef17fe4c71983257a6a7 From cc1d86affc8b6fe2c3228cb2cfa392f9b1c106e6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 24 Apr 2019 21:08:27 -0600 Subject: [PATCH 02/26] Update submodules --- cookbook | 2 +- relibc | 2 +- rust | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook b/cookbook index 26187c2..de017a0 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 26187c28bee339044a54bdf945986a1bc97dd88b +Subproject commit de017a06660cd76af04a12e55be7fddd4018f731 diff --git a/relibc b/relibc index 7bde036..6a16275 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 7bde03603149c70d85d6986f278853db90a58878 +Subproject commit 6a16275817150e698ae919bdfad8ec1681da7fb1 diff --git a/rust b/rust index debbcb0..8a29e31 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit debbcb0ed621aa3904e0ef17fe4c71983257a6a7 +Subproject commit 8a29e319cc2af26a1bc354de3c781e8d183ba4b2 From 65b86820f8578eed32561e35f2239e8116679880 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 25 Apr 2019 14:03:53 -0600 Subject: [PATCH 03/26] Move nulld, zerod, randd to initfs --- initfs.toml | 6 ++++++ initfs_coreboot.toml | 6 ++++++ initfs_live.toml | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/initfs.toml b/initfs.toml index a0a4cc1..d3d98bd 100644 --- a/initfs.toml +++ b/initfs.toml @@ -9,13 +9,19 @@ prompt = false [packages] drivers = {} init = {} +nulld = {} +randd = {} redoxfs = {} +zerod = {} [[files]] path="/etc/init.rc" data=""" export PATH /bin export TMPDIR /tmp +nulld +zerod +randd vesad T T G stdio display:1 ps2d us diff --git a/initfs_coreboot.toml b/initfs_coreboot.toml index e1441c8..e1c7231 100644 --- a/initfs_coreboot.toml +++ b/initfs_coreboot.toml @@ -9,13 +9,19 @@ prompt = false [packages] drivers = {} init = {} +nulld = {} +randd = {} redoxfs = {} +zerod = {} [[files]] path="/etc/init.rc" data=""" export PATH /bin export TMPDIR /tmp +nulld +zerod +randd vesad T T G stdio display:1 ps2d us diff --git a/initfs_live.toml b/initfs_live.toml index e1441c8..e1c7231 100644 --- a/initfs_live.toml +++ b/initfs_live.toml @@ -9,13 +9,19 @@ prompt = false [packages] drivers = {} init = {} +nulld = {} +randd = {} redoxfs = {} +zerod = {} [[files]] path="/etc/init.rc" data=""" export PATH /bin export TMPDIR /tmp +nulld +zerod +randd vesad T T G stdio display:1 ps2d us From c30c05a423343d378bdd8bab0b821452ed076c8a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Apr 2019 18:44:36 -0600 Subject: [PATCH 04/26] Update rust and cookbook --- cookbook | 2 +- rust | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index de017a0..6cb0634 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit de017a06660cd76af04a12e55be7fddd4018f731 +Subproject commit 6cb06348f929f5c29e63eb97fd183306f83c7613 diff --git a/rust b/rust index 8a29e31..68128e3 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 8a29e319cc2af26a1bc354de3c781e8d183ba4b2 +Subproject commit 68128e3c7ae042da298ca0b872af82844db6feb5 From 37c64f36c9fa3f872cea59a212b3156d38ae0df5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Apr 2019 18:45:02 -0600 Subject: [PATCH 05/26] Update rust --- rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust b/rust index 68128e3..0b26941 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 68128e3c7ae042da298ca0b872af82844db6feb5 +Subproject commit 0b26941fd5044c31765bd525ac7e65b95b874a16 From cc5ecdcebe287f2a124eff64d8e0de6a35d81354 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 27 Apr 2019 20:46:03 -0600 Subject: [PATCH 06/26] Update submodules --- cookbook | 2 +- kernel | 2 +- relibc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook b/cookbook index 6cb0634..63d4da1 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 6cb06348f929f5c29e63eb97fd183306f83c7613 +Subproject commit 63d4da139eb808bec82b2c2dab2a6e242be21ec6 diff --git a/kernel b/kernel index eecc9a4..afa3f38 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit eecc9a442cad28b72eafb2dc0bfe2d729260fb40 +Subproject commit afa3f38310657f4644e52cf9d01d3220d2f250f0 diff --git a/relibc b/relibc index 6a16275..6d857f8 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 6a16275817150e698ae919bdfad8ec1681da7fb1 +Subproject commit 6d857f8db778c9500324052b7b52e7be5e2d44c7 From 0e4af27fe217b6640eb7f7e66ad1f4fdbfaea63d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Apr 2019 19:33:24 -0600 Subject: [PATCH 07/26] Update submodules --- cookbook | 2 +- kernel | 2 +- relibc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook b/cookbook index 63d4da1..5f795c0 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 63d4da139eb808bec82b2c2dab2a6e242be21ec6 +Subproject commit 5f795c0df9748fad912bd632a0fcbad67c721450 diff --git a/kernel b/kernel index afa3f38..fcd8ce7 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit afa3f38310657f4644e52cf9d01d3220d2f250f0 +Subproject commit fcd8ce7e1b6e3c6fe14b0ce8ba23c0792dbd3610 diff --git a/relibc b/relibc index 6d857f8..cfc5410 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 6d857f8db778c9500324052b7b52e7be5e2d44c7 +Subproject commit cfc541019c7260959dc3f4bae97d3c7be4199d17 From e4f3995c9b632ff8a5a82d40778f266fceeee403 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Apr 2019 19:37:41 -0600 Subject: [PATCH 08/26] Move nulld, randd, and zerod to initfs --- config/desktop.toml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config/desktop.toml b/config/desktop.toml index c82bd72..a4864a2 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -90,7 +90,7 @@ netsurf = {} netutils = {} #newlib = {} #newlibtest = {} -nulld = {} +#nulld = {} #openjazz = {} #openssl = {} #openttd = {} @@ -115,11 +115,12 @@ pkgutils = {} ptyd = {} #python = {} #qemu = {} -randd = {} +#randd = {} #readline = {} # ncurses redoxfs = {} #redox-ssh = {} #relibc = {} +#relibc-tests = {} #ripgrep = {} #rodioplay = {} #rs-nes = {} @@ -156,7 +157,7 @@ uutils = {} #webrender = {} #winit = {} #xz = {} -zerod = {} +#zerod = {} #zlib = {} # User settings @@ -174,9 +175,6 @@ password = "" [[files]] path = "/etc/init.d/00_base" data = """ -nulld -zerod -randd ipcd logd ptyd From 74155a9845ff72b55228ec9d70424b4afd97749a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 May 2019 10:07:39 -0600 Subject: [PATCH 09/26] Update relibc and redoxfs --- redoxfs | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/redoxfs b/redoxfs index 219bf26..946efa2 160000 --- a/redoxfs +++ b/redoxfs @@ -1 +1 @@ -Subproject commit 219bf26966f29dac35d77589e7c553da1efb5a7a +Subproject commit 946efa2fb5e39669a7fcfc4faf33ed01e92af1ee diff --git a/relibc b/relibc index cfc5410..20a2355 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit cfc541019c7260959dc3f4bae97d3c7be4199d17 +Subproject commit 20a2355bc4055b3eeaa728e17bade36d66463157 From 02098e42fd00275a7973bdabe42a478c88dc7a55 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 May 2019 10:12:45 -0600 Subject: [PATCH 10/26] Remove nulld, randd, and zerod from other filesystem configs --- config/acid.toml | 9 +++------ config/coreboot.toml | 9 +++------ config/minimal.toml | 9 +++------ config/server.toml | 9 +++------ cookbook | 2 +- 5 files changed, 13 insertions(+), 25 deletions(-) diff --git a/config/acid.toml b/config/acid.toml index 66661b0..8185b48 100644 --- a/config/acid.toml +++ b/config/acid.toml @@ -90,7 +90,7 @@ logd = {} #netutils = {} #newlib = {} #newlibtest = {} -nulld = {} +#nulld = {} #openjazz = {} #openssl = {} #openttd = {} @@ -115,7 +115,7 @@ nulld = {} ptyd = {} #python = {} #qemu = {} -randd = {} +#randd = {} #readline = {} # ncurses #redoxfs = {} #redox-ssh = {} @@ -156,7 +156,7 @@ randd = {} #webrender = {} #winit = {} #xz = {} -zerod = {} +#zerod = {} #zlib = {} # User settings @@ -174,9 +174,6 @@ password = "" [[files]] path = "/etc/init.d/00_base" data = """ -nulld -zerod -randd ipcd logd ptyd diff --git a/config/coreboot.toml b/config/coreboot.toml index 4fe8ff1..4c8ea17 100644 --- a/config/coreboot.toml +++ b/config/coreboot.toml @@ -90,7 +90,7 @@ ipcd = {} #netutils = {} #newlib = {} #newlibtest = {} -nulld = {} +#nulld = {} #openjazz = {} #openssl = {} #openttd = {} @@ -118,7 +118,7 @@ orbutils-orblogin = {} ptyd = {} #python = {} #qemu = {} -randd = {} +#randd = {} #readline = {} # ncurses #redoxfs = {} #redox-ssh = {} @@ -159,7 +159,7 @@ uutils = {} #webrender = {} #winit = {} #xz = {} -zerod = {} +#zerod = {} #zlib = {} # User settings @@ -177,9 +177,6 @@ password = "" [[files]] path = "/etc/init.d/00_base" data = """ -nulld -zerod -randd ipcd #logd ptyd diff --git a/config/minimal.toml b/config/minimal.toml index 2da1175..f080b37 100644 --- a/config/minimal.toml +++ b/config/minimal.toml @@ -90,7 +90,7 @@ logd = {} #netutils = {} #newlib = {} #newlibtest = {} -nulld = {} +#nulld = {} #openjazz = {} #openssl = {} #openttd = {} @@ -115,7 +115,7 @@ nulld = {} ptyd = {} #python = {} #qemu = {} -randd = {} +#randd = {} #readline = {} # ncurses #redoxfs = {} #redox-ssh = {} @@ -156,7 +156,7 @@ randd = {} #webrender = {} #winit = {} #xz = {} -zerod = {} +#zerod = {} #zlib = {} # User settings @@ -174,9 +174,6 @@ password = "" [[files]] path = "/etc/init.d/00_base" data = """ -nulld -zerod -randd ipcd logd ptyd diff --git a/config/server.toml b/config/server.toml index a15fdcb..da4cf27 100644 --- a/config/server.toml +++ b/config/server.toml @@ -90,7 +90,7 @@ netstack = {} netutils = {} #newlib = {} #newlibtest = {} -nulld = {} +#nulld = {} #openjazz = {} #openssl = {} #openttd = {} @@ -115,7 +115,7 @@ pkgutils = {} ptyd = {} #python = {} #qemu = {} -randd = {} +#randd = {} #readline = {} # ncurses redoxfs = {} #redox-ssh = {} @@ -156,7 +156,7 @@ uutils = {} #webrender = {} #winit = {} #xz = {} -zerod = {} +#zerod = {} #zlib = {} # User settings @@ -174,9 +174,6 @@ password = "" [[files]] path = "/etc/init.d/00_base" data = """ -nulld -zerod -randd ipcd logd ptyd diff --git a/cookbook b/cookbook index 5f795c0..bf74983 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 5f795c0df9748fad912bd632a0fcbad67c721450 +Subproject commit bf7498328c70fd8f0bc9e672b8978cbea8322763 From 128a2f845c475b6abbe6ffff5d5a0fdf32305810 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 May 2019 10:41:24 -0600 Subject: [PATCH 11/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index bf74983..1a43f19 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit bf7498328c70fd8f0bc9e672b8978cbea8322763 +Subproject commit 1a43f19e0dd9ba00b454f3c2432ce2c7ae5fb318 From 65685ac9a1397b9433d1bd075c730f7897a8649d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 May 2019 10:58:57 -0600 Subject: [PATCH 12/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 1a43f19..f158c12 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 1a43f19e0dd9ba00b454f3c2432ce2c7ae5fb318 +Subproject commit f158c12fb7f63b14d9ace73683383224e08e522e From b5847ff27f35b7c704dd050bb80d8379963ed01e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 May 2019 12:26:54 -0600 Subject: [PATCH 13/26] Update submodules --- redoxfs | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/redoxfs b/redoxfs index 946efa2..a226d19 160000 --- a/redoxfs +++ b/redoxfs @@ -1 +1 @@ -Subproject commit 946efa2fb5e39669a7fcfc4faf33ed01e92af1ee +Subproject commit a226d190965cd2b475dd7d9aac5ff8921c0efc7e diff --git a/relibc b/relibc index 20a2355..9e4bbd7 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 20a2355bc4055b3eeaa728e17bade36d66463157 +Subproject commit 9e4bbd72cc4b337492ca026955a5e4bf659c4f55 From ba05be3b736440e0ee30b585dbea2e94e0c4de79 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 14 May 2019 21:59:12 -0600 Subject: [PATCH 14/26] Update rust --- rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust b/rust index 0b26941..21ba98f 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 0b26941fd5044c31765bd525ac7e65b95b874a16 +Subproject commit 21ba98fa2cebf10914e1ee1d8bea9e512d26c358 From 0918ceb8428eafe0acee642c90273f1330448432 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 May 2019 15:52:11 -0600 Subject: [PATCH 15/26] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 9e4bbd7..dab6530 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 9e4bbd72cc4b337492ca026955a5e4bf659c4f55 +Subproject commit dab6530fb40200e8ee8ecebc315ecf8dd88d385b From bd4a3ef82a7d00e1f5f9a2f372fd459721fd756c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 2 Jun 2019 06:45:18 -0600 Subject: [PATCH 16/26] Improve prefix generation and fix build --- mk/config.mk | 2 +- mk/disk.mk | 4 +--- mk/prefix.mk | 38 ++++++++++++++++++++++++++------------ 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index 5f6eace..423b334 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -4,7 +4,7 @@ ARCH?=x86_64 ## Flags to pass to the installer (empty to download binary packages) INSTALLER_FLAGS?=--cookbook=cookbook ## Enabled to use binary prefix (much faster) -PREFIX_BINARY?=1 +PREFIX_BINARY?=0 ## Enabled to build custom rustc PREFIX_RUSTC?=1 ## Filesystem size in MB (256 is the default) diff --git a/mk/disk.mk b/mk/disk.mk index 979d522..182ccfd 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -26,9 +26,7 @@ build/coreboot.elf: bootloader-coreboot/build/bootloader cp -v $< $@ bootloader-efi/build/$(EFI_TARGET)/boot.efi: FORCE - unset XARGO_HOME XARGO_RUST_SRC && \ cd bootloader-efi && \ - rustup component add rust-src && \ $(MAKE) build/$(EFI_TARGET)/boot.efi TARGET=$(EFI_TARGET) build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi @@ -36,7 +34,7 @@ build/bootloader.efi: bootloader-efi/build/$(EFI_TARGET)/boot.efi cp -v $< $@ build/harddrive-efi.bin: build/bootloader.efi build/filesystem.bin - dd if=/dev/zero of=$@.partial bs=1048576 count=$$(du -m $< | cut -f1) + dd if=/dev/zero of=$@.partial bs=1048576 count=$$(expr $$(du -m $< | cut -f1) + 1) mkfs.vfat $@.partial mmd -i $@.partial efi mmd -i $@.partial efi/boot diff --git a/mk/prefix.mk b/mk/prefix.mk index 5b7be9f..17f8325 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -54,6 +54,32 @@ $(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install --directory="$<" \ . +$(PREFIX)/rust-install: $(ROOT)/rust | $(PREFIX)/relibc-install + rm -rf "$(PREFIX)/rust-build" "$@.partial" "$@" + mkdir -p "$(PREFIX)/rust-build" + cp -r "$(PREFIX)/relibc-install" "$@.partial" + cd "$(PREFIX)/rust-build" && \ + export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \ + "$ Date: Sun, 2 Jun 2019 06:45:24 -0600 Subject: [PATCH 17/26] Update redoxfs --- redoxfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redoxfs b/redoxfs index a226d19..a70a01b 160000 --- a/redoxfs +++ b/redoxfs @@ -1 +1 @@ -Subproject commit a226d190965cd2b475dd7d9aac5ff8921c0efc7e +Subproject commit a70a01bd4a16d7e0cc12e756f95ec0511e857fd4 From 907a162d5ba5a99e6137110abf1ef33b3aef19d5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 7 Jun 2019 15:59:45 -0600 Subject: [PATCH 18/26] Fix build with new compiler-builtins, update kernel --- kernel | 2 +- mk/config.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel b/kernel index fcd8ce7..1be77c2 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit fcd8ce7e1b6e3c6fe14b0ce8ba23c0792dbd3610 +Subproject commit 1be77c2ab4a011b458b6df3501451a4fcd626d76 diff --git a/mk/config.mk b/mk/config.mk index 423b334..1733ca1 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -27,6 +27,7 @@ endif # Automatic variables ROOT=$(CURDIR) +export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt export RUST_TARGET_PATH=$(ROOT)/kernel/targets export XARGO_HOME=$(ROOT)/build/xargo export XARGO_RUST_SRC=$(ROOT)/rust/src From 8aa3a3f922630bcdaafed2afd06413d42d5a167a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 7 Jun 2019 18:39:55 -0600 Subject: [PATCH 19/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index f158c12..129a28a 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit f158c12fb7f63b14d9ace73683383224e08e522e +Subproject commit 129a28a4d13e24361c50d69f1e76268acd7e9d99 From 855bdd6e59eda9f2bf3b002585842c7d337f4264 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 15 Jun 2019 08:55:36 -0600 Subject: [PATCH 20/26] Update cookbook and relibc --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 129a28a..8f73c67 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 129a28a4d13e24361c50d69f1e76268acd7e9d99 +Subproject commit 8f73c678dc573cdc16052ddab587e129e40cd442 diff --git a/relibc b/relibc index dab6530..651d383 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit dab6530fb40200e8ee8ecebc315ecf8dd88d385b +Subproject commit 651d38300a3e8cf2cedab45380d393e8932759f9 From 1a487ed93444e86d10cedf706eb5ae61eaf5a79c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 15 Jun 2019 10:54:01 -0600 Subject: [PATCH 21/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 8f73c67..d3a85bd 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 8f73c678dc573cdc16052ddab587e129e40cd442 +Subproject commit d3a85bd5a4fbd6be60b17122486c3206c3122691 From c11838fc66c09339c3d648492c78949c9b8c39e3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 15 Jun 2019 15:47:22 -0600 Subject: [PATCH 22/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index d3a85bd..cf87630 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit d3a85bd5a4fbd6be60b17122486c3206c3122691 +Subproject commit cf87630f261223a7be7785aac085a965a54b5731 From 0e91ee971b6b161619776447dbf627205d102894 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 16 Jun 2019 17:24:04 +0200 Subject: [PATCH 23/26] Yet another shell.nix update --- shell.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/shell.nix b/shell.nix index d314b07..1005d2e 100644 --- a/shell.nix +++ b/shell.nix @@ -1,9 +1,21 @@ -with import {}; -stdenv.mkDerivation { - name = "redox"; +{ pkgs ? import {} }: +pkgs.mkShell rec { hardeningDisable = [ "all" ]; - nativeBuildInputs = [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu ]; - buildInputs = [ openssl gettext libtool flex libpng perl perlPackages.HTMLParser ]; + # used in mk/prefix.mk to patch interpreter when PREFIX_BINARY=1 + NIX_INTERPRETER = "${pkgs.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2"; + + LIBRARY_PATH = pkgs.lib.makeLibraryPath [ + pkgs.gcc-unwrapped pkgs.stdenv.cc.libc + (toString prefix/x86_64-unknown-redox) + ]; + LD_LIBRARY_PATH = LIBRARY_PATH; + + nativeBuildInputs = with pkgs; [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu rustup ]; + buildInputs = with pkgs; [ fuse openssl gettext libtool flex libpng perl perlPackages.HTMLParser ]; + + shellHook = '' + export PATH="/run/wrappers/bin:$PATH" + ''; } From edc7446f2cac91dc73cf465942637561da24618d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 16 Jun 2019 09:58:02 -0600 Subject: [PATCH 24/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index cf87630..8b30df8 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit cf87630f261223a7be7785aac085a965a54b5731 +Subproject commit 8b30df818c37f45d386f8c7756453f847fe88921 From 02574c26bdad6aaf2701e740eeed3acb8270ee80 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 16 Jun 2019 19:37:40 -0600 Subject: [PATCH 25/26] Merge prefix changes from master --- mk/prefix.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mk/prefix.mk b/mk/prefix.mk index 17f8325..aeecbbf 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -80,6 +80,7 @@ $(PREFIX)/rust-install.tar.gz: $(PREFIX)/rust-install --file "$@" \ --directory="$<" \ . + ifeq ($(PREFIX_BINARY),1) $(PREFIX)/gcc-install.tar.gz: @@ -91,6 +92,8 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc-install.tar.gz rm -rf "$@.partial" "$@" mkdir -p "$@.partial" tar --extract --file "$<" --directory "$@.partial" --strip-components=1 + [ -n "$$NIX_INTERPRETER" ] && find "$@.partial" -executable -type f -exec \ + patchelf --set-interpreter "$$NIX_INTERPRETER" "{}" \; touch "$@.partial" mv "$@.partial" "$@" From b8620a250340c87043688a80368d4bde8977c6e6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 16 Jun 2019 21:00:49 -0600 Subject: [PATCH 26/26] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 8b30df8..e16d691 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 8b30df818c37f45d386f8c7756453f847fe88921 +Subproject commit e16d69117a8494110bb8a4286cb2273ed86bc712