From e63bbf82274c92c08e9c0ac82cb3b5d00f0e56f1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 3 Jul 2018 19:43:00 -0600 Subject: [PATCH 01/62] Support for relibc --- filesystem.toml | 2 +- kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filesystem.toml b/filesystem.toml index 0eca33d..8635c61 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -61,7 +61,7 @@ nulld = {} orbdata = {} orbital = {} orbterm = {} -orbutils = {} +#orbutils = {} #pastel = {} #patch = {} #periodictable = {} diff --git a/kernel b/kernel index 054fc41..b86672b 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 054fc41beb82019152bfc5186557aedb4e8b5d2a +Subproject commit b86672b81e9e431b31231620c1a79e4424d422d4 From c890157771e8e46062baa917619e31460a12529c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jul 2018 08:14:01 -0600 Subject: [PATCH 02/62] Enable orbutils --- filesystem.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filesystem.toml b/filesystem.toml index 8635c61..0eca33d 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -61,7 +61,7 @@ nulld = {} orbdata = {} orbital = {} orbterm = {} -#orbutils = {} +orbutils = {} #pastel = {} #patch = {} #periodictable = {} From 045444630683d45e9d139b954f7b2d6a660060be Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 Aug 2018 09:03:06 -0600 Subject: [PATCH 03/62] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 79e8d44..2179beb 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 79e8d44a2e65acb0e74170209d7d551a1b997048 +Subproject commit 2179beb185b9d1aad07e7d74c796b22187cacbde From fd0aa3f0acdd3c860f8c9350e6958345f0373602 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 Aug 2018 11:14:46 -0600 Subject: [PATCH 04/62] Update kernel --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index b86672b..c7b3765 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit b86672b81e9e431b31231620c1a79e4424d422d4 +Subproject commit c7b3765d6f3aed4bae9cab0cbb10b5b6262148ff From 04db5667f395283e4341fb645da534f606f86105 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 Aug 2018 11:18:54 -0600 Subject: [PATCH 05/62] Update kernel --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index c7b3765..fe90664 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit c7b3765d6f3aed4bae9cab0cbb10b5b6262148ff +Subproject commit fe90664e33f7077bc8c47d7a267fe14547bba105 From 8087864ef6a915be1de013780df503ea79b50e21 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 Aug 2018 11:52:06 -0600 Subject: [PATCH 06/62] Update kernel --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index fe90664..23f4c76 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit fe90664e33f7077bc8c47d7a267fe14547bba105 +Subproject commit 23f4c76ebbd9186f5464a37bb97650e1cc36b774 From 4905ab3b2012a056f7f143d75596b2325ef3ba26 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 Aug 2018 16:45:31 -0600 Subject: [PATCH 07/62] Update rust --- rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust b/rust index fbb1fd1..7000dcf 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit fbb1fd15d7c3ef511d785c7718899eddde095ccc +Subproject commit 7000dcf6c2bd6890650d6a5a0610875ac54a2e04 From c29ae8b002009b698913259670e2e34bdce06cc2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 Aug 2018 16:48:22 -0600 Subject: [PATCH 08/62] Update kernel and rust --- kernel | 2 +- rust | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel b/kernel index 23f4c76..69766ce 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 23f4c76ebbd9186f5464a37bb97650e1cc36b774 +Subproject commit 69766ce3b938417a0f182ce6e3314f79e5946151 diff --git a/rust b/rust index 7000dcf..fb7c3a8 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 7000dcf6c2bd6890650d6a5a0610875ac54a2e04 +Subproject commit fb7c3a8e702209d217a726872580c9513540312a From 44d3a88b9730f591c84628721cd1bb2750c81810 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 12 Aug 2018 08:30:33 -0600 Subject: [PATCH 09/62] Update kernel --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index 69766ce..1718d28 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 69766ce3b938417a0f182ce6e3314f79e5946151 +Subproject commit 1718d28d393d9aa289dcd54a401656d32ab6b7de From 08a1b552e6d62c6782836a553815f56b7bc7abcf Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Aug 2018 18:46:43 -0600 Subject: [PATCH 10/62] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 2179beb..04f6d62 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 2179beb185b9d1aad07e7d74c796b22187cacbde +Subproject commit 04f6d62a3ecb2011f3025ed559bb6f5aa6d6612e From 1da660637e6cb8b41a6a61e1bf0db5623c362c23 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Aug 2018 18:48:03 -0600 Subject: [PATCH 11/62] Update rust --- rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust b/rust index fb7c3a8..cc99bf5 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit fb7c3a8e702209d217a726872580c9513540312a +Subproject commit cc99bf5d8f02038313dcbcb3c2d3c049d8a348a3 From 5a7df39cde9db9e88a5c1fb5cfe31c01a297dd59 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Aug 2018 19:07:27 -0600 Subject: [PATCH 12/62] Add relibc submodule --- .gitmodules | 3 +++ relibc | 1 + 2 files changed, 4 insertions(+) create mode 160000 relibc diff --git a/.gitmodules b/.gitmodules index ea89854..5cecbb9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "redoxfs"] path = redoxfs url = https://gitlab.redox-os.org/redox-os/redoxfs.git +[submodule "relibc"] + path = relibc + url = https://gitlab.redox-os.org/redox-os/relibc.git diff --git a/relibc b/relibc new file mode 160000 index 0000000..1282097 --- /dev/null +++ b/relibc @@ -0,0 +1 @@ +Subproject commit 128209788c70dea70d8b2e588e989b24548455d9 From 9aaf4e3558dc3ec3fed161aa62c84243dc772f6b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 16 Aug 2018 20:30:54 -0600 Subject: [PATCH 13/62] WIP: Build of cross compiler --- .gitignore | 3 ++- Makefile | 11 +++++---- mk/cross.mk | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 mk/cross.mk diff --git a/.gitignore b/.gitignore index 378eac2..e3ccede 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -build +/build/ +/prefix/ diff --git a/Makefile b/Makefile index 8d7b5d8..3ab87db 100644 --- a/Makefile +++ b/Makefile @@ -40,10 +40,8 @@ fetch: "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \ "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)" -# Emulation recipes -include mk/qemu.mk -include mk/bochs.mk -include mk/virtualbox.mk +# Cross compiler recipes +include mk/cross.mk # Kernel recipes include mk/kernel.mk @@ -55,6 +53,11 @@ include mk/filesystem.mk # Disk images include mk/disk.mk +# Emulation recipes +include mk/qemu.mk +include mk/bochs.mk +include mk/virtualbox.mk + # CI image target ci-img: FORCE make INSTALLER_FLAGS= build/harddrive.bin.gz build/harddrive-efi.bin.gz build/livedisk.iso build/livedisk-efi.iso diff --git a/mk/cross.mk b/mk/cross.mk new file mode 100644 index 0000000..80c0811 --- /dev/null +++ b/mk/cross.mk @@ -0,0 +1,69 @@ +PREFIX=$(ROOT)/prefix + +binutils: $(PREFIX)/binutils-install + +gcc-freestanding: $(PREFIX)/gcc-freestanding-install + +relibc: $(PREFIX)/relibc-install + +gcc: $(PREFIX)/gcc-install + +$(PREFIX)/binutils.tar.bz2: + mkdir -p "$(@D)" + wget -O $@.partial "https://gitlab.redox-os.org/redox-os/binutils-gdb/-/archive/master/binutils-gdb-master.tar.bz2" + mv $@.partial $@ + +$(PREFIX)/binutils: $(PREFIX)/binutils.tar.bz2 + mkdir -p "$@.partial" + tar --extract --file "$<" --directory "$@.partial" --strip-components=1 + mv "$@.partial" "$@" + +$(PREFIX)/binutils-install: $(PREFIX)/binutils + rm -rf "$<-build" "$@" + mkdir -p "$<-build" "$@" + cd "$<-build" && \ + "$ Date: Fri, 17 Aug 2018 15:21:55 -0600 Subject: [PATCH 14/62] Fix build for relibc --- mk/cross.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mk/cross.mk b/mk/cross.mk index 80c0811..c566cee 100644 --- a/mk/cross.mk +++ b/mk/cross.mk @@ -50,9 +50,14 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc touch "$@" $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding-install - cd relibc && \ - make all -j `nproc` && \ - make DESTDIR="$@" install -j `nproc` + rm -rf "$(PREFIX)/relibc-build" + cp -r relibc "$(PREFIX)/relibc-build" + cd $(PREFIX)/relibc-build && \ + export PATH="$(PREFIX)/binutils-install/bin:$(PREFIX)/gcc-freestanding-install/bin:$$PATH" && \ + rustup target add "$(TARGET)" && \ + make clean && \ + make all && \ + make DESTDIR="$@" install touch "$@" $(PREFIX)/gcc-install: $(PREFIX)/gcc $(PREFIX)/relibc-install From 3d2a3c04193eef273cbfe5a3cd1747b052699702 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 15:32:43 -0600 Subject: [PATCH 15/62] Path variables, prefix recipe --- mk/cross.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mk/cross.mk b/mk/cross.mk index c566cee..fd1b622 100644 --- a/mk/cross.mk +++ b/mk/cross.mk @@ -1,12 +1,10 @@ PREFIX=$(ROOT)/prefix -binutils: $(PREFIX)/binutils-install +PREFIX_FREESTANDING_PATH=$(PREFIX)/binutils-install/bin:$(PREFIX)/gcc-freestanding-install/bin +PREFIX_PATH=$(PREFIX)/binutils-install/bin:$(PREFIX)/gcc-install/bin -gcc-freestanding: $(PREFIX)/gcc-freestanding-install - -relibc: $(PREFIX)/relibc-install - -gcc: $(PREFIX)/gcc-install +prefix: $(PREFIX)/gcc-install + touch "$@" $(PREFIX)/binutils.tar.bz2: mkdir -p "$(@D)" @@ -53,11 +51,11 @@ $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding- rm -rf "$(PREFIX)/relibc-build" cp -r relibc "$(PREFIX)/relibc-build" cd $(PREFIX)/relibc-build && \ - export PATH="$(PREFIX)/binutils-install/bin:$(PREFIX)/gcc-freestanding-install/bin:$$PATH" && \ + export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \ rustup target add "$(TARGET)" && \ make clean && \ make all && \ - make DESTDIR="$@" install + make DESTDIR="$@/usr" install touch "$@" $(PREFIX)/gcc-install: $(PREFIX)/gcc $(PREFIX)/relibc-install From dbc1c9676f5f1e1e8af742ae6cca2214f79f731e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 15:48:55 -0600 Subject: [PATCH 16/62] Update gcc build with freestanding path --- mk/cross.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/mk/cross.mk b/mk/cross.mk index fd1b622..80ccc70 100644 --- a/mk/cross.mk +++ b/mk/cross.mk @@ -62,6 +62,7 @@ $(PREFIX)/gcc-install: $(PREFIX)/gcc $(PREFIX)/relibc-install rm -rf "$<-build" "$@" mkdir -p "$<-build" "$@" cd "$<-build" && \ + export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \ "$ Date: Fri, 17 Aug 2018 16:58:38 -0600 Subject: [PATCH 17/62] Update installer --- installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer b/installer index 999db45..8e39b2e 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 999db45b0ebed633cc3ef1e12d16647644cd5b52 +Subproject commit 8e39b2ea32ea997d946d2b540cb19361a4c23207 From f65c2639f7f5a39eb5c5fba296be1b38014b8f69 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 17:13:18 -0600 Subject: [PATCH 18/62] Update installer --- installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer b/installer index 8e39b2e..be2e094 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 8e39b2ea32ea997d946d2b540cb19361a4c23207 +Subproject commit be2e09472a9f0907d46a1890c3cc7ce675643de4 From 6155781b4606df6f0f5b320f86053d3f875bf192 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 17:16:26 -0600 Subject: [PATCH 19/62] Update installer --- installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer b/installer index be2e094..123350a 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit be2e09472a9f0907d46a1890c3cc7ce675643de4 +Subproject commit 123350ae6075687c766817364fb9a0cc81c33e5f From 6fe44777ee4e571202baafdd5ff0c54c789c2d84 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 18:00:27 -0600 Subject: [PATCH 20/62] Update kernel --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index 1718d28..2ba21b3 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 1718d28d393d9aa289dcd54a401656d32ab6b7de +Subproject commit 2ba21b33ad35df10acea26dfce682855590c9f75 From 2027210677dd6dbd79a75a610d31630d680af8ab Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 18:41:27 -0600 Subject: [PATCH 21/62] Update relibc --- mk/{cross.mk => prefix.mk} | 0 relibc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename mk/{cross.mk => prefix.mk} (100%) diff --git a/mk/cross.mk b/mk/prefix.mk similarity index 100% rename from mk/cross.mk rename to mk/prefix.mk diff --git a/relibc b/relibc index 1282097..4e3b673 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 128209788c70dea70d8b2e588e989b24548455d9 +Subproject commit 4e3b6732d5a6477703b06e5a2085deeeb8928c68 From 233295bc178b5b1465eead86590def79e2bd2f7e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 18:47:48 -0600 Subject: [PATCH 22/62] Specify prefix as a dependency --- Makefile | 2 +- mk/filesystem.mk | 3 ++- mk/initfs.mk | 6 ++++-- mk/prefix.mk | 6 ++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3ab87db..5c99b62 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ fetch: "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)" # Cross compiler recipes -include mk/cross.mk +include mk/prefix.mk # Kernel recipes include mk/kernel.mk diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 8f19f17..9281e9f 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,4 +1,4 @@ -build/filesystem.bin: filesystem.toml build/bootloader build/kernel +build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix -$(FUMOUNT) build/filesystem/ || true rm -rf $@ $@.partial build/filesystem/ dd if=/dev/zero of=$@.partial bs=1048576 count=256 @@ -9,6 +9,7 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel sleep 2 pgrep redoxfs cp filesystem.toml build/bootloader build/kernel build/filesystem/ + export PATH="$(PREFIX_PATH):$$PATH" && \ cargo run --manifest-path installer/Cargo.toml --release -- $(INSTALLER_FLAGS) -c $< build/filesystem/ chown -R 0:0 build/filesystem chown -R 1000:1000 build/filesystem/home/user diff --git a/mk/initfs.mk b/mk/initfs.mk index 8c76dc2..16790db 100644 --- a/mk/initfs.mk +++ b/mk/initfs.mk @@ -1,13 +1,15 @@ -build/initfs.tag: initfs.toml +build/initfs.tag: initfs.toml prefix cd kernel && xargo clean rm -rf build/initfs mkdir -p build/initfs + export PATH="$(PREFIX_PATH):$$PATH" && \ cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs/ touch $@ -build/initfs_live.tag: initfs_live.toml +build/initfs_live.tag: initfs_live.toml prefix cd kernel && xargo clean rm -rf build/initfs_live mkdir -p build/initfs_live + export PATH="$(PREFIX_PATH):$$PATH" && \ cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs_live/ touch $@ diff --git a/mk/prefix.mk b/mk/prefix.mk index 80ccc70..3384110 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -15,6 +15,7 @@ $(PREFIX)/binutils: $(PREFIX)/binutils.tar.bz2 mkdir -p "$@.partial" tar --extract --file "$<" --directory "$@.partial" --strip-components=1 mv "$@.partial" "$@" + touch "$@" $(PREFIX)/binutils-install: $(PREFIX)/binutils rm -rf "$<-build" "$@" @@ -28,13 +29,14 @@ $(PREFIX)/binutils-install: $(PREFIX)/binutils $(PREFIX)/gcc.tar.bz2: mkdir -p "$(@D)" wget -O $@.partial "https://gitlab.redox-os.org/redox-os/gcc/-/archive/redox/gcc-redox.tar.bz2" - mv $@.partial $@ + mv "$@.partial" "$@" $(PREFIX)/gcc: $(PREFIX)/gcc.tar.bz2 mkdir -p "$@.partial" tar --extract --file "$<" --directory "$@.partial" --strip-components=1 cd "$@.partial" && ./contrib/download_prerequisites mv "$@.partial" "$@" + touch "$@" $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc rm -rf "$<-freestanding-build" "$@" @@ -58,7 +60,7 @@ $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding- make DESTDIR="$@/usr" install touch "$@" -$(PREFIX)/gcc-install: $(PREFIX)/gcc $(PREFIX)/relibc-install +$(PREFIX)/gcc-install: $(PREFIX)/gcc | $(PREFIX)/relibc-install rm -rf "$<-build" "$@" mkdir -p "$<-build" "$@" cd "$<-build" && \ From d8f7b10773e095068c34c98f286843d73d0827e9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 17 Aug 2018 20:00:22 -0600 Subject: [PATCH 23/62] Update installer and fix password setting --- filesystem.toml | 2 +- installer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/filesystem.toml b/filesystem.toml index 0eca33d..46ca92b 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -96,7 +96,7 @@ zerod = {} # User settings [users.root] # Password is set to "password" -password = "$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk" +password = "password" uid = 0 gid = 0 name = "root" diff --git a/installer b/installer index 123350a..33fa0af 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 123350ae6075687c766817364fb9a0cc81c33e5f +Subproject commit 33fa0af5214decdda7cc7ac39407ad18d727583b From 06f34c23f9e2fd584fa5941a8ae67a0d9cacd2f9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 18 Aug 2018 08:46:16 -0600 Subject: [PATCH 24/62] Update cookbook and relibc --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 04f6d62..3c8ac89 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 04f6d62a3ecb2011f3025ed559bb6f5aa6d6612e +Subproject commit 3c8ac89d1acb662f56012470ecb8f6a95b1231a9 diff --git a/relibc b/relibc index 4e3b673..c25ce6a 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 4e3b6732d5a6477703b06e5a2085deeeb8928c68 +Subproject commit c25ce6a5f3412fcaf4ce94a8bcca2ca79c5ace55 From a12245376dbb12b0d6187c318121c55aa6e3bfeb Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 11:32:54 -0600 Subject: [PATCH 25/62] WIP: Fixes for running ci-pkg --- Makefile | 11 +++--- ci.toml | 98 ++++++++++++++++++++++++------------------------- cookbook | 2 +- filesystem.toml | 2 +- 4 files changed, 57 insertions(+), 56 deletions(-) diff --git a/Makefile b/Makefile index 5c99b62..fd47a43 100644 --- a/Makefile +++ b/Makefile @@ -70,11 +70,12 @@ ci-img: FORCE cd build/img && sha256sum -b * > SHA256SUM # CI packaging target -ci-pkg: FORCE - cd cookbook && ./fetch.sh \ - "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../ci.toml)" - cd cookbook && ./repo.sh \ - "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../ci.toml)" +ci-pkg: prefix FORCE + export PATH="$(PREFIX_PATH):$$PATH" && \ + PACKAGES="$$(cargo run --manifest-path installer/Cargo.toml -- --list-packages -c ci.toml)" && \ + cd cookbook && \ + ./fetch.sh "$${PACKAGES}" && \ + ./repo.sh "$${PACKAGES}" # An empty target FORCE: diff --git a/ci.toml b/ci.toml index af8dd68..8cfb22e 100644 --- a/ci.toml +++ b/ci.toml @@ -5,85 +5,85 @@ prompt = false [packages] acid = {} -autoconf = {} -automake = {} -bash = {} -binutils = {} +#autoconf = {} +#automake = {} +#bash = {} +#binutils = {} ca-certificates = {} #cargo = {} -cleye = {} +#cleye = {} #cmatrix = {} contain = {} coreutils = {} -curl = {} -dash = {} -diffutils = {} -dosbox = {} +#curl = {} +#dash = {} +#diffutils = {} +#dosbox = {} drivers = {} #drivers-041 = {} -duktape = {} -expat = {} +#duktape = {} +#expat = {} extrautils = {} #fd = {} -ffmpeg = {} +#ffmpeg = {} findutils = {} -freedoom = {} -freetype = {} +#freedoom = {} +#freetype = {} game-2048 = {} games = {} -gawk = {} -gcc = {} -generaluser-gs = {} +#gawk = {} +#gcc = {} +#generaluser-gs = {} #gigalomania = {} -git = {} -gnu-binutils = {} -gnu-grep = {} -gnu-make = {} +#git = {} +#gnu-binutils = {} +#gnu-grep = {} +#gnu-make = {} init = {} -installer = {} +#installer = {} ion = {} ipcd = {} -jansson = {} +#jansson = {} keyboard-sfx = {} -lci = {} -libjpeg = {} +#lci = {} +#libjpeg = {} liborbital = {} -libpng = {} +#libpng = {} #libsodium = {} logd = {} -lua = {} -mdp = {} -nasm = {} -ncdu = {} -ncurses = {} -ncursesw = {} +#lua = {} +#mdp = {} +#nasm = {} +#ncdu = {} +#ncurses = {} +#ncursesw = {} netdb = {} netstack = {} -netsurf = {} +#netsurf = {} netutils = {} -newlib = {} -newlibtest = {} +#newlib = {} +#newlibtest = {} nulld = {} -openssl = {} -openttd = {} -openttd-opengfx = {} -openttd-openmsx = {} +#openssl = {} +#openttd = {} +#openttd-opengfx = {} +#openttd-openmsx = {} orbdata = {} orbital = {} orbterm = {} orbutils = {} pastel = {} -patch = {} +#patch = {} periodictable = {} #perl = {} pixelcannon = {} pkgutils = {} #powerline = {} -prboom = {} +#prboom = {} ptyd = {} -python = {} +#python = {} randd = {} -readline = {} +#readline = {} redoxfs = {} #redox-ssh = {} relibc = {} @@ -94,19 +94,19 @@ rustual-boy = {} sdl = {} sdl_image = {} sdl_mixer = {} -sed = {} +#sed = {} shellstorm = {} smith = {} sodium = {} #ssh = {} terminfo = {} termplay = {} -timidity = {} +#timidity = {} ttf-hack = {} userutils = {} uutils = {} -vim = {} -vttest = {} -xz = {} +#vim = {} +#vttest = {} +#xz = {} zerod = {} -zlib = {} +#zlib = {} diff --git a/cookbook b/cookbook index 3c8ac89..c49323d 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 3c8ac89d1acb662f56012470ecb8f6a95b1231a9 +Subproject commit c49323d8bc6920cee9fbfb0b4fce79423f89dab8 diff --git a/filesystem.toml b/filesystem.toml index 46ca92b..31cc58c 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -16,7 +16,7 @@ ca-certificates = {} #cargo = {} #cleye = {} #cmatrix = {} -#contain = {} +contain = {} coreutils = {} #curl = {} #dash = {} From ec3095f375dbb93490813288ff584df5a968879a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 11:38:11 -0600 Subject: [PATCH 26/62] Update rust --- rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust b/rust index cc99bf5..2385b08 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit cc99bf5d8f02038313dcbcb3c2d3c049d8a348a3 +Subproject commit 2385b0853d779371f02166746be21a5296cc5a75 From 5e3350315dbb759616172f749c5ce2300e1cd87c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 12:34:33 -0600 Subject: [PATCH 27/62] Fix build of installer --- ci.toml | 2 +- installer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.toml b/ci.toml index 8cfb22e..83a8264 100644 --- a/ci.toml +++ b/ci.toml @@ -40,7 +40,7 @@ games = {} #gnu-grep = {} #gnu-make = {} init = {} -#installer = {} +installer = {} ion = {} ipcd = {} #jansson = {} diff --git a/installer b/installer index 33fa0af..49b7a5f 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 33fa0af5214decdda7cc7ac39407ad18d727583b +Subproject commit 49b7a5f427aaa08c217d784ec4b643d285cce5a8 From dea9942d274fd82db45f555354d757c38a735fb3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 14:11:29 -0600 Subject: [PATCH 28/62] Set path to include binutils when building freestanding gcc --- mk/prefix.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 3384110..c71175e 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -1,7 +1,8 @@ PREFIX=$(ROOT)/prefix -PREFIX_FREESTANDING_PATH=$(PREFIX)/binutils-install/bin:$(PREFIX)/gcc-freestanding-install/bin -PREFIX_PATH=$(PREFIX)/binutils-install/bin:$(PREFIX)/gcc-install/bin +PREFIX_BINUTILS_PATH=$(PREFIX)/binutils-install/bin +PREFIX_FREESTANDING_PATH=$(PREFIX_BINUTILS_PATH):$(PREFIX)/gcc-freestanding-install/bin +PREFIX_PATH=$(PREFIX_BINUTILS_PATH):$(PREFIX)/gcc-install/bin prefix: $(PREFIX)/gcc-install touch "$@" @@ -42,6 +43,7 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc rm -rf "$<-freestanding-build" "$@" mkdir -p "$<-freestanding-build" "$@" cd "$<-freestanding-build" && \ + export PATH="$(PREFIX_BINUTILS_PATH):$$PATH" && \ "$ Date: Sun, 19 Aug 2018 17:53:45 -0600 Subject: [PATCH 29/62] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index c49323d..1ce61ef 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit c49323d8bc6920cee9fbfb0b4fce79423f89dab8 +Subproject commit 1ce61efb450e0836690312adf05f99ed6e0f43e7 From 72e52563bc425b9d4e1710d7a68d54ab649af4b5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 18:02:38 -0600 Subject: [PATCH 30/62] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 1ce61ef..8aefc03 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 1ce61efb450e0836690312adf05f99ed6e0f43e7 +Subproject commit 8aefc0353fba5a63331b410c8ab942bbf37dd4c7 From ded6688bda0e666079227cedcba2a2a39fc65412 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 18:05:03 -0600 Subject: [PATCH 31/62] Enable more packages --- ci.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci.toml b/ci.toml index 83a8264..668606f 100644 --- a/ci.toml +++ b/ci.toml @@ -46,9 +46,9 @@ ipcd = {} #jansson = {} keyboard-sfx = {} #lci = {} -#libjpeg = {} +libjpeg = {} liborbital = {} -#libpng = {} +libpng = {} #libsodium = {} logd = {} #lua = {} @@ -109,4 +109,4 @@ uutils = {} #vttest = {} #xz = {} zerod = {} -#zlib = {} +zlib = {} From 2bc74f2ddd5c6a017fad10d455d88558edf87a06 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 19 Aug 2018 18:12:03 -0600 Subject: [PATCH 32/62] Add more packages that can build on relibc --- ci.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci.toml b/ci.toml index 668606f..ee15e29 100644 --- a/ci.toml +++ b/ci.toml @@ -11,18 +11,18 @@ acid = {} #binutils = {} ca-certificates = {} #cargo = {} -#cleye = {} +cleye = {} #cmatrix = {} contain = {} coreutils = {} #curl = {} -#dash = {} +dash = {} #diffutils = {} #dosbox = {} drivers = {} #drivers-041 = {} #duktape = {} -#expat = {} +expat = {} extrautils = {} #fd = {} #ffmpeg = {} @@ -49,7 +49,7 @@ keyboard-sfx = {} libjpeg = {} liborbital = {} libpng = {} -#libsodium = {} +libsodium = {} logd = {} #lua = {} #mdp = {} From fe02198a50b3e3f0a691f85c135960c476b6178e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 24 Aug 2018 14:22:04 -0600 Subject: [PATCH 33/62] Update bootloader --- bootloader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootloader b/bootloader index 615d9e1..ad8f6a9 160000 --- a/bootloader +++ b/bootloader @@ -1 +1 @@ -Subproject commit 615d9e136512a21cc5fb22b5ab74389e078d3fb7 +Subproject commit ad8f6a97e9205552e1414bb481b3d13ec9ae5fae From 18e7b71389e27390cbbade76699219ed4e80d50f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 24 Aug 2018 14:45:18 -0600 Subject: [PATCH 34/62] Update bootloader-efi --- bootloader-efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootloader-efi b/bootloader-efi index de305ff..401794d 160000 --- a/bootloader-efi +++ b/bootloader-efi @@ -1 +1 @@ -Subproject commit de305ff651b811f2640ea685bbd9f2b12b974f15 +Subproject commit 401794d72f4e9913246898da638de544325e7a95 From f7ba58fe56f6865139309108b8d2083695346000 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 24 Aug 2018 15:10:28 -0600 Subject: [PATCH 35/62] Update bootloader-efi --- bootloader-efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootloader-efi b/bootloader-efi index 401794d..555b236 160000 --- a/bootloader-efi +++ b/bootloader-efi @@ -1 +1 @@ -Subproject commit 401794d72f4e9913246898da638de544325e7a95 +Subproject commit 555b236027a32a87bca273999b008e9534f9f876 From 83182c11c99b775e848ba51220a35587f9a922aa Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 27 Aug 2018 09:28:21 -0600 Subject: [PATCH 36/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index c25ce6a..70eda38 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit c25ce6a5f3412fcaf4ce94a8bcca2ca79c5ace55 +Subproject commit 70eda382d39f4dce73a4bb2e3e2c72d16f60f92e From 45bce3d196a4960bfb089e198908cfe470be9603 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 8 Sep 2018 11:06:01 -0600 Subject: [PATCH 37/62] Update submodules --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 8aefc03..3286f7e 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 8aefc0353fba5a63331b410c8ab942bbf37dd4c7 +Subproject commit 3286f7e4b60fb65b77097074c520feac5fa596de diff --git a/relibc b/relibc index 70eda38..50c03f2 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 70eda382d39f4dce73a4bb2e3e2c72d16f60f92e +Subproject commit 50c03f289fc2993a29ea7a19d59d45c603e1ad81 From 74d93bc73c7dc589a5e58bb095d27c19f6ffa4e7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 8 Sep 2018 11:06:35 -0600 Subject: [PATCH 38/62] Build openssl in ci --- ci.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.toml b/ci.toml index ee15e29..7e9b611 100644 --- a/ci.toml +++ b/ci.toml @@ -64,7 +64,7 @@ netutils = {} #newlib = {} #newlibtest = {} nulld = {} -#openssl = {} +openssl = {} #openttd = {} #openttd-opengfx = {} #openttd-openmsx = {} From b2cff5ffe533473176ba57a393910ae9b1614f11 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 14 Sep 2018 20:57:08 -0600 Subject: [PATCH 39/62] Add ripgrep --- ci.toml | 1 + cookbook | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.toml b/ci.toml index 7e9b611..42df909 100644 --- a/ci.toml +++ b/ci.toml @@ -87,6 +87,7 @@ randd = {} redoxfs = {} #redox-ssh = {} relibc = {} +ripgrep = {} rs-nes = {} #rust = {} rust64 = {} diff --git a/cookbook b/cookbook index 3286f7e..6f49579 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 3286f7e4b60fb65b77097074c520feac5fa596de +Subproject commit 6f4957952d48e69f52d06a0519061bd75df99f79 From 580287392bb9d43a65f8fadf98898e1e5dc0ddef Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 15 Sep 2018 07:25:49 -0600 Subject: [PATCH 40/62] - Do not copy relibc before building - Remove debug section from live kernel as well --- mk/filesystem.mk | 4 +++- mk/kernel.mk | 2 ++ mk/prefix.mk | 4 +--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 9281e9f..fa9d437 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -8,7 +8,9 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- $@.partial build/filesystem/ sleep 2 pgrep redoxfs - cp filesystem.toml build/bootloader build/kernel build/filesystem/ + cp $< build/filesystem/filesystem.toml + cp build/bootloader build/filesystem/bootloader + cp build/kernel build/filesystem/kernel export PATH="$(PREFIX_PATH):$$PATH" && \ cargo run --manifest-path installer/Cargo.toml --release -- $(INSTALLER_FLAGS) -c $< build/filesystem/ chown -R 0:0 build/filesystem diff --git a/mk/kernel.mk b/mk/kernel.mk index d830042..d5fb7f0 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -16,6 +16,8 @@ build/kernel: kernel/linkers/$(ARCH).ld build/libkernel.a build/kernel_live: kernel/linkers/$(ARCH).ld build/libkernel_live.a build/live.o $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_live.a build/live.o + objcopy --only-keep-debug $@ $@.sym + objcopy --strip-debug $@ build/live.o: build/filesystem.bin #TODO: More general use of $(ARCH) diff --git a/mk/prefix.mk b/mk/prefix.mk index c71175e..c6d3d14 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -53,11 +53,9 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding-install rm -rf "$(PREFIX)/relibc-build" - cp -r relibc "$(PREFIX)/relibc-build" - cd $(PREFIX)/relibc-build && \ + cd relibc && \ export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \ rustup target add "$(TARGET)" && \ - make clean && \ make all && \ make DESTDIR="$@/usr" install touch "$@" From 3fbcc8630631fe107d17e45365a82e8280db446b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 15 Sep 2018 12:36:56 -0600 Subject: [PATCH 41/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 50c03f2..dfb07e4 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 50c03f289fc2993a29ea7a19d59d45c603e1ad81 +Subproject commit dfb07e473a577162981e1aaf9c1793d8098660d9 From 91c288d1815e539b039a198584d1085e1d2b3d49 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 17 Sep 2018 17:06:22 -0600 Subject: [PATCH 42/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index dfb07e4..23098b6 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit dfb07e473a577162981e1aaf9c1793d8098660d9 +Subproject commit 23098b694e33d53801eee5248238bd816ba45b70 From e90ab786414a74d96dc0ba9278dcbb3a489f370b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 17 Sep 2018 21:30:15 -0600 Subject: [PATCH 43/62] Fix incorrect clean in prefix build --- mk/prefix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index c6d3d14..4dba7f1 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -52,7 +52,7 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc touch "$@" $(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding-install - rm -rf "$(PREFIX)/relibc-build" + rm -rf "$@" cd relibc && \ export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \ rustup target add "$(TARGET)" && \ From 00ee3716005a1b6814241c0e2a5a654909e91ae0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 17 Sep 2018 21:30:30 -0600 Subject: [PATCH 44/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 23098b6..c2f4c1d 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 23098b694e33d53801eee5248238bd816ba45b70 +Subproject commit c2f4c1dbc98fc31dbd296e773eb5a3e30a79d2e8 From bcdcd1d01ef16852a577b1e846f3f7c02425cbb0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 18 Sep 2018 08:34:21 -0600 Subject: [PATCH 45/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index c2f4c1d..60f0050 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit c2f4c1dbc98fc31dbd296e773eb5a3e30a79d2e8 +Subproject commit 60f00508d39a16e9c9685e88beb19ecd1334c2c6 From eb5f1f1e90ecd6c4f7badd332fe835cc8d80b109 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 18 Sep 2018 08:53:46 -0600 Subject: [PATCH 46/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 60f0050..043ecf2 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 60f00508d39a16e9c9685e88beb19ecd1334c2c6 +Subproject commit 043ecf2cf9336d81ec205a203a8238cab31e1dcd From 0efb736d1c784672dda7ea2390053d44198a8195 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 18 Sep 2018 16:18:53 -0600 Subject: [PATCH 47/62] Update cookbook Fix shadow permissions --- cookbook | 2 +- mk/filesystem.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 6f49579..974ea65 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 6f4957952d48e69f52d06a0519061bd75df99f79 +Subproject commit 974ea6514edcbf186ecb335b6505bf6edc2da58b diff --git a/mk/filesystem.mk b/mk/filesystem.mk index fa9d437..e72cde1 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -26,6 +26,7 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix chmod +s build/filesystem/bin/passwd chmod +s build/filesystem/bin/su chmod +s build/filesystem/bin/sudo + chmod og-rwx build/filesystem/etc/shadow mkdir build/filesystem/tmp chmod 1777 build/filesystem/tmp sync From 40d557ace3b7724ddc9a6a54ab22ed7e5a2b72fd Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 18 Sep 2018 16:19:46 -0600 Subject: [PATCH 48/62] Add example driver --- filesystem.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/filesystem.toml b/filesystem.toml index 31cc58c..8a718aa 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -24,6 +24,7 @@ coreutils = {} #dosbox = {} drivers = {} #duktape = {} +exampled = {} extrautils = {} #fd = {} #ffmpeg = {} @@ -139,6 +140,12 @@ getty display:2 getty debug: -J """ +[[files]] +path = "/etc/init.d/99_exampled" +data = """ +exampled +""" + [[files]] path = "/etc/net/dns" data = """ From 3852c61d7d0833e5a1e93c6d1eb9e1b5c2f081d3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 18 Sep 2018 16:20:52 -0600 Subject: [PATCH 49/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 043ecf2..2aa7597 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 043ecf2cf9336d81ec205a203a8238cab31e1dcd +Subproject commit 2aa7597a2b58e6df8134ea1b9bcdab6ea7f83658 From 84046c61a90ff35266b995dfc560539c9c3038ba Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 18 Sep 2018 19:52:59 -0600 Subject: [PATCH 50/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 2aa7597..9dbf49f 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 2aa7597a2b58e6df8134ea1b9bcdab6ea7f83658 +Subproject commit 9dbf49fdcd6bef221710798057b6cba857920cd6 From b84431c462e559cb2ccf0256d8fb6a4ff19e2521 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 20 Sep 2018 14:40:49 -0700 Subject: [PATCH 51/62] update cookbook and relibc --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 974ea65..453279b 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 974ea6514edcbf186ecb335b6505bf6edc2da58b +Subproject commit 453279bbc603ed82d411772d319ef0f603bdf813 diff --git a/relibc b/relibc index 9dbf49f..a567197 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 9dbf49fdcd6bef221710798057b6cba857920cd6 +Subproject commit a567197b5427a3c0c9dff518fabe2b207c6c3c1c From 2c56620860fa3d6c732d961755c49eea630f20f6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 21 Sep 2018 10:26:02 -0700 Subject: [PATCH 52/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index a567197..a0b4e21 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit a567197b5427a3c0c9dff518fabe2b207c6c3c1c +Subproject commit a0b4e21bbb0e272039a2f8b199e368a274f32c97 From 032650bc7f476b6e8206e3de5cc9006e8ce8d0bc Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 22 Sep 2018 20:02:34 -0600 Subject: [PATCH 53/62] Do not include exampled --- filesystem.toml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/filesystem.toml b/filesystem.toml index 8a718aa..6d32dfe 100644 --- a/filesystem.toml +++ b/filesystem.toml @@ -24,7 +24,7 @@ coreutils = {} #dosbox = {} drivers = {} #duktape = {} -exampled = {} +#exampled = {} extrautils = {} #fd = {} #ffmpeg = {} @@ -140,12 +140,6 @@ getty display:2 getty debug: -J """ -[[files]] -path = "/etc/init.d/99_exampled" -data = """ -exampled -""" - [[files]] path = "/etc/net/dns" data = """ From 7707f5892f088f48fb78403e97f64e543fe926fa Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 23 Sep 2018 11:20:18 -0600 Subject: [PATCH 54/62] Update kernel --- kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel b/kernel index 2ba21b3..7a97867 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 2ba21b33ad35df10acea26dfce682855590c9f75 +Subproject commit 7a978678681bf06c49eaa2181918e321e7ed6832 From bc8d6af23a32e9b6126a9944e4596401306c6ad0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 23 Sep 2018 11:20:49 -0600 Subject: [PATCH 55/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index a0b4e21..658dc34 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit a0b4e21bbb0e272039a2f8b199e368a274f32c97 +Subproject commit 658dc34d30c53e40d6bb57939cc4675d2b2f911f From fe3cd70be2fad772af024ec553eb328465018225 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 23 Sep 2018 11:44:51 -0600 Subject: [PATCH 56/62] Update cookbook and kernel --- cookbook | 2 +- kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 453279b..f5d0f84 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 453279bbc603ed82d411772d319ef0f603bdf813 +Subproject commit f5d0f842a5afdcd3ea1c39ed2bbb52d95cd6295d diff --git a/kernel b/kernel index 7a97867..0d510a4 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 7a978678681bf06c49eaa2181918e321e7ed6832 +Subproject commit 0d510a4f744817303cd7043b1cf250796880a1f1 From c531bc6a017c49d8bb12200ed1dfeb320e7b9b8f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 24 Sep 2018 14:45:49 -0700 Subject: [PATCH 57/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 658dc34..b309cd8 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 658dc34d30c53e40d6bb57939cc4675d2b2f911f +Subproject commit b309cd832d7ccbe3fd48734cf36cbfd0ad4b5431 From 97768369c4fab0c332107d68d67cf3701b53d5ac Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 25 Sep 2018 21:06:38 -0600 Subject: [PATCH 58/62] Update submodules --- kernel | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel b/kernel index 0d510a4..3b1bf1b 160000 --- a/kernel +++ b/kernel @@ -1 +1 @@ -Subproject commit 0d510a4f744817303cd7043b1cf250796880a1f1 +Subproject commit 3b1bf1bac1aa21eed53c3465d7b1a470f5922396 diff --git a/relibc b/relibc index b309cd8..aff3589 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit b309cd832d7ccbe3fd48734cf36cbfd0ad4b5431 +Subproject commit aff35892be178b01cfb468d056c2167c53439933 From 4582de65506b9e55632de5c22c6bb2a0d98ab05d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 8 Oct 2018 19:51:33 -0600 Subject: [PATCH 59/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index aff3589..91675b5 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit aff35892be178b01cfb468d056c2167c53439933 +Subproject commit 91675b5bc8d6ba1d4610d369ff4ab34eecde2b26 From a4aef9bd08b183950481a3e9e130fd80b863afb8 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 8 Oct 2018 19:52:04 -0600 Subject: [PATCH 60/62] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index f5d0f84..c0ac989 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit f5d0f842a5afdcd3ea1c39ed2bbb52d95cd6295d +Subproject commit c0ac9899084239b6c0aa7fbb739bdf05420220e7 From 3ff41947a10fd3f6b96b052fefe666a4678a28a6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 13 Oct 2018 19:28:12 -0600 Subject: [PATCH 61/62] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 91675b5..057d239 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 91675b5bc8d6ba1d4610d369ff4ab34eecde2b26 +Subproject commit 057d23908a420bfd5244a14a3016d87b805dd17e From 07fd85eeee8d2964e9404f0fed1375f183afbee5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 14 Oct 2018 10:02:17 -0600 Subject: [PATCH 62/62] Update cookbook and relibc --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index c0ac989..3bcea75 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit c0ac9899084239b6c0aa7fbb739bdf05420220e7 +Subproject commit 3bcea75ac2223757b9529d0d91e78d1401305ce1 diff --git a/relibc b/relibc index 057d239..23fe526 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 057d23908a420bfd5244a14a3016d87b805dd17e +Subproject commit 23fe526c555e894916b1a17df2f5fc1a44a16d23