From 19673cc850201c2121ec9b6967ff94513982d93e Mon Sep 17 00:00:00 2001 From: Wildan M Date: Fri, 30 May 2025 05:41:46 +0700 Subject: [PATCH 01/34] Fix CI regarding to glibc version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75d4b0e82..575e6b538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ # The GitLab Continuous Integration configuration -image: "ubuntu:22.04" +image: "ubuntu:24.04" variables: GIT_STRATEGY: "clone" From 41b51f692aa55954c59ba474166c6fcf159405e2 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 1 Jun 2025 20:54:56 +0200 Subject: [PATCH 02/34] Add support for netboot This includes building a tftp root and using it with qemu. --- Makefile | 6 ++++++ mk/disk.mk | 9 ++++++++- mk/qemu.mk | 14 ++++++++++++-- redox.ipxe | 5 +++++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 redox.ipxe diff --git a/Makefile b/Makefile index e0de2def9..8af03f3ea 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,12 @@ live: rm -f $(BUILD)/livedisk.iso $(MAKE) $(BUILD)/livedisk.iso +netboot: + -$(FUMOUNT) $(BUILD)/filesystem/ || true + -$(FUMOUNT) /tmp/redox_installer/ || true + rm -rf $(BUILD)/livedisk.iso $(BUILD)/tftproot + $(MAKE) $(BUILD)/tftproot + popsicle: $(BUILD)/livedisk.iso popsicle-gtk $(BUILD)/livedisk.iso diff --git a/mk/disk.mk b/mk/disk.mk index 39b3aa3e2..c23a72c3c 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -21,9 +21,16 @@ $(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG) FILESYSTEM_SIZE=$(shell $(INSTALLER) --filesystem-size -c $(FILESYSTEM_CONFIG)); \ fi && \ truncate -s "$$FILESYSTEM_SIZE"m $@.partial - umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --live $@.partial + umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial mv $@.partial $@ +$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/livedisk.iso + rm -r $(BUILD)/tftproot || true + mkdir $(BUILD)/tftproot + cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi + ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.img + cp redox.ipxe $(BUILD)/tftproot/redox.ipxe + $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) mkdir -p $(BUILD) -$(FUMOUNT) $(BUILD)/filesystem/ || true diff --git a/mk/qemu.mk b/mk/qemu.mk index 0a2a479a8..b91923f7b 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -2,6 +2,7 @@ QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH) QEMUFLAGS=-d guest_errors -name "Redox OS $(ARCH)" +netboot?=no ifeq ($(ARCH),i686) audio?=ac97 @@ -148,14 +149,19 @@ else QEMUFLAGS+=-device e1000,netdev=net0,id=nic0 endif + EXTRANETARGS= + ifeq ($(netboot),yes) + EXTRANETARGS+=,tftp=$(BUILD)/tftproot,bootfile=redox.ipxe + endif + ifneq ($(bridge),) QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 else ifeq ($(net),redir) # port 8080 and 8083 - webservers # port 64126 - our gdbserver implementation - QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126 + QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126$(EXTRANETARGS) else - QEMUFLAGS+=-netdev user,id=net0 -object filter-dump,id=f1,netdev=net0,file=$(BUILD)/network.pcap + QEMUFLAGS+=-netdev user,id=net0$(EXTRANETARGS) -object filter-dump,id=f1,netdev=net0,file=$(BUILD)/network.pcap endif endif @@ -236,6 +242,10 @@ qemu-deps:$(FIRMWARE) qemu-deps:$(QEMU_KERNEL) +ifeq ($(netboot),yes) +qemu-deps: $(BUILD)/tftproot +endif + qemu-deps: $(PFLASH0) ifneq ($(PFLASH1),) diff --git a/redox.ipxe b/redox.ipxe new file mode 100644 index 000000000..f92772110 --- /dev/null +++ b/redox.ipxe @@ -0,0 +1,5 @@ +#!ipxe + +kernel bootloader-live.efi +initrd redox-live.img +boot From ed0da0981bc968e96e1806ac98fef3154c9f58c7 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Tue, 3 Jun 2025 18:35:10 +0000 Subject: [PATCH 03/34] Speedup cloning libtool --- mk/prefix.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 09692c736..3636625d3 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -75,11 +75,12 @@ $(PREFIX)/libtool: mkdir -p "$@.partial" git clone \ - --recurse-submodules \ "https://gitlab.redox-os.org/redox-os/libtool/" \ --branch "v$(LIBTOOL_VERSION)-redox" \ - --depth 2 \ + --filter=tree:0 \ "$@.partial" + git -C "$@.partial" submodule update \ + --filter=tree:0 --init --recursive touch "$@.partial" echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version From e352fe6bfdc0395336a8ae2c8b14459a12e0e86d Mon Sep 17 00:00:00 2001 From: Josh Megnauth Date: Fri, 6 Jun 2025 23:54:29 -0400 Subject: [PATCH 04/34] vbox: --audio is deprecated/removed --audio-driver is the replacement switch. --- mk/virtualbox.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/virtualbox.mk b/mk/virtualbox.mk index 5f84fff69..414bf1f6e 100644 --- a/mk/virtualbox.mk +++ b/mk/virtualbox.mk @@ -31,7 +31,7 @@ virtualbox: $(BUILD)/harddrive.img $(VBM) modifyvm Redox --usb off # on $(VBM) modifyvm Redox --keyboard ps2 $(VBM) modifyvm Redox --mouse ps2 - $(VBM) modifyvm Redox --audio $(VB_AUDIO) + $(VBM) modifyvm Redox --audio-driver $(VB_AUDIO) $(VBM) modifyvm Redox --audiocontroller hda $(VBM) modifyvm Redox --audioout on $(VBM) modifyvm Redox --nestedpaging on From 9750f5548d6f057c181f6333099488f174b212e5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jun 2025 10:53:16 -0600 Subject: [PATCH 05/34] Update submodules --- cookbook | 2 +- installer | 2 +- redoxfs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook b/cookbook index 2dfe26c66..7a34f3bdc 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 2dfe26c6682fa527f66c31c2a47a4b49f7305117 +Subproject commit 7a34f3bdc384f41140e575cc59aab1d18001525a diff --git a/installer b/installer index 9e888c06f..0db88e3cb 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 9e888c06fa8b5b28c053dc49bfc9a0a92c533a75 +Subproject commit 0db88e3cb42dc778e3682ae5c8e4eeb7ca7cfee5 diff --git a/redoxfs b/redoxfs index 940b02751..9e2e370c0 160000 --- a/redoxfs +++ b/redoxfs @@ -1 +1 @@ -Subproject commit 940b027514506ec5d0437418c567aff510e91b83 +Subproject commit 9e2e370c0bdf1393b49e6cbb711c1f4a8bdc2ef9 From 64d96d6429073ed3ed93d48bee1968d1a12989d6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jun 2025 11:10:00 -0600 Subject: [PATCH 06/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 7a34f3bdc..e48573812 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 7a34f3bdc384f41140e575cc59aab1d18001525a +Subproject commit e4857381242b486a666f0380e8b9ac613f49f8be From 0952932bfb0cdb7adfdf1d331d5310e60dff3dc0 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jun 2025 11:49:01 -0600 Subject: [PATCH 07/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index e48573812..8aa0d8b99 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit e4857381242b486a666f0380e8b9ac613f49f8be +Subproject commit 8aa0d8b99de16171ea3b1483b1c2e91aa0b08ea7 From ae6acd03c2fdb7e7d5f9177c94eca6975e88b94c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jun 2025 11:57:07 -0600 Subject: [PATCH 08/34] Update installer --- installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer b/installer index 0db88e3cb..2c8c6bf30 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 0db88e3cb42dc778e3682ae5c8e4eeb7ca7cfee5 +Subproject commit 2c8c6bf30fb2e4e897ad56da746b4f9edf05905f From 7cd845f0de4426c0072c5868e9e2723d0ccb080e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jun 2025 12:25:16 -0600 Subject: [PATCH 09/34] Update submodules --- installer | 2 +- redoxfs | 2 +- relibc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer b/installer index 2c8c6bf30..2c3afb495 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 2c8c6bf30fb2e4e897ad56da746b4f9edf05905f +Subproject commit 2c3afb4956f2238505cd7d1df56388af5c6ae8a9 diff --git a/redoxfs b/redoxfs index 9e2e370c0..066e5f6e8 160000 --- a/redoxfs +++ b/redoxfs @@ -1 +1 @@ -Subproject commit 9e2e370c0bdf1393b49e6cbb711c1f4a8bdc2ef9 +Subproject commit 066e5f6e8a98c2343082b4cac0746daaeb2c2b62 diff --git a/relibc b/relibc index be49c1936..63418095e 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit be49c1936a2dfed51050ac4ece1e4ae05b297208 +Subproject commit 63418095e578459452b341d6d3c084efabf7f574 From 3b67441ef1c7b2152d8324477c6eb381f79bccba Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 12 Jun 2025 13:04:26 -0600 Subject: [PATCH 10/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 8aa0d8b99..b6f9f8b24 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 8aa0d8b99de16171ea3b1483b1c2e91aa0b08ea7 +Subproject commit b6f9f8b249da6b974c1d50f32392e0fff8f773f6 From 5ebd0729f91fe2c203545c2b7a0e485270229027 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Fri, 13 Jun 2025 02:16:00 +0000 Subject: [PATCH 11/34] Make libtool cloning works for older git --- mk/prefix.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 3636625d3..f8d675643 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -75,12 +75,12 @@ $(PREFIX)/libtool: mkdir -p "$@.partial" git clone \ + --recurse-submodules \ + --shallow-submodules \ "https://gitlab.redox-os.org/redox-os/libtool/" \ --branch "v$(LIBTOOL_VERSION)-redox" \ - --filter=tree:0 \ + --depth 2 \ "$@.partial" - git -C "$@.partial" submodule update \ - --filter=tree:0 --init --recursive touch "$@.partial" echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version From d9b396a66262a13a3ad1a3a2da9b83d3c84a3729 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 13 Jun 2025 11:18:13 -0600 Subject: [PATCH 12/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index b6f9f8b24..c853efdeb 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit b6f9f8b249da6b974c1d50f32392e0fff8f773f6 +Subproject commit c853efdeb24d7a2c31f25d0a391350954d7c2bb4 From 114ceca0eb29662e6f4d44963640d13b582a2780 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 13 Jun 2025 12:30:14 -0600 Subject: [PATCH 13/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index c853efdeb..3ec01b769 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit c853efdeb24d7a2c31f25d0a391350954d7c2bb4 +Subproject commit 3ec01b7693d46745c0fac413eb79065ef3712fac From ce6db377f8db8f34c5efbd7782e6789092854527 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 13 Jun 2025 15:12:14 -0600 Subject: [PATCH 14/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 3ec01b769..abce13bbc 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 3ec01b7693d46745c0fac413eb79065ef3712fac +Subproject commit abce13bbc0a58025b138d8a1c549f0260778a274 From df9d92d25055cb30cd10c84d34948f4707c53c89 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 13 Jun 2025 15:27:06 -0600 Subject: [PATCH 15/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index abce13bbc..3c00f7750 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit abce13bbc0a58025b138d8a1c549f0260778a274 +Subproject commit 3c00f775021572b57a564a660cf02357f6c86540 From ab49ed59ecaba0189be4e5a714cb54b3d236a8d9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 13 Jun 2025 15:47:14 -0600 Subject: [PATCH 16/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 3c00f7750..a7eb3c2a8 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 3c00f775021572b57a564a660cf02357f6c86540 +Subproject commit a7eb3c2a8605c06ea7a68772d368b58d5ce4a102 From 8143dbf021df486bd694bcb5042dc48a972c1782 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 15 Jun 2025 21:12:32 -0600 Subject: [PATCH 17/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index a7eb3c2a8..51bad855b 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit a7eb3c2a8605c06ea7a68772d368b58d5ce4a102 +Subproject commit 51bad855b00fddc4f78f638c3f9adc2592341a0a From 70489f9452bfe194e7fd6cc00b1460fb48bb11ff Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 16 Jun 2025 16:33:10 -0300 Subject: [PATCH 18/34] Add and improve items on the ecosystem table in the README --- README.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 443440c80..c60d33485 100644 --- a/README.md +++ b/README.md @@ -34,21 +34,23 @@ Redox _is not_ just a kernel, it's a **full-featured operating system**, providi Some of the key repositories on the Redox GitLab: -| Essential Repos | Maintainer -|--------------------------------------------------------------------------------------|--------------------------- -| [Kernel](https://gitlab.redox-os.org/redox-os/kernel) | **@jackpot51** -| [RedoxFS (default filesystem)](https://gitlab.redox-os.org/redox-os/redoxfs) | **@jackpot51** -| [Drivers](https://gitlab.redox-os.org/redox-os/drivers) | **@jackpot51** -| [Orbital (display server and window manager)](https://gitlab.redox-os.org/redox-os/orbital) | **@jackpot51** -| [pkgutils (current package manager)](https://gitlab.redox-os.org/redox-os/pkgutils) | **@jackpot51** -| [relibc (C POSIX library written in Rust)](https://gitlab.redox-os.org/redox-os/relibc) | **@jackpot51** -| [netstack (network stack)](https://gitlab.redox-os.org/redox-os/netstack) | **@jackpot51** -| [Ion (defauilt shell)](https://gitlab.redox-os.org/redox-os/ion) | **@jackpot51** -| [Termion (terminal library)](https://gitlab.redox-os.org/redox-os/termion) | **@jackpot51** -| This repo - the root of the Build System | **@jackpot51** -| [cookbook (Build system for system components and programs)](https://gitlab.redox-os.org/redox-os/cookbook) | **@jackpot51** **@hatred_45** -| [Redoxer (Tool for Redox development testing)](https://gitlab.redox-os.org/redox-os/redoxer) | **@jackpot51** -| [The Redox Book](https://gitlab.redox-os.org/redox-os/book) | **@hatred_45** +| Essential Repositories | Maintainer +|-------------------------------------------------------------------------------------------------------------|--------------------------- +| [Kernel](https://gitlab.redox-os.org/redox-os/kernel) | **@jackpot51** +| [Base (essential system components)](https://gitlab.redox-os.org/redox-os/base) | **@jackpot51** +| [RedoxFS (default filesystem)](https://gitlab.redox-os.org/redox-os/redoxfs) | **@jackpot51** +| [Drivers](https://gitlab.redox-os.org/redox-os/drivers) | **@jackpot51** +| [relibc (C POSIX library written in Rust)](https://gitlab.redox-os.org/redox-os/relibc) | **@jackpot51** +| [Ion (defauilt shell)](https://gitlab.redox-os.org/redox-os/ion) | **@jackpot51** +| [Termion (terminal library)](https://gitlab.redox-os.org/redox-os/termion) | **@jackpot51** +| [netstack (network stack)](https://gitlab.redox-os.org/redox-os/netstack) | **@jackpot51** +| [pkgutils (current package manager)](https://gitlab.redox-os.org/redox-os/pkgutils) | **@jackpot51** +| [Orbital (display server and window manager)](https://gitlab.redox-os.org/redox-os/orbital) | **@jackpot51** +| This repo - the root of the Build System | **@jackpot51** +| [Cookbook (build system for system components and programs)](https://gitlab.redox-os.org/redox-os/cookbook) | **@jackpot51** **@hatred_45** +| [Redoxer (tool for easy Redox development on Linux)](https://gitlab.redox-os.org/redox-os/redoxer) | **@jackpot51** +| [The Redox Book](https://gitlab.redox-os.org/redox-os/book) | **@jackpot51** **@hatred_45** +| [Website](https://gitlab.redox-os.org/redox-os/website) | **@jackpot51** **@hatred_45** ## What it looks like From 8a1ed957f780e5b824faa8673218816ba7300934 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Mon, 16 Jun 2025 17:14:12 -0300 Subject: [PATCH 19/34] Improve CONTRIBUTING.md --- CONTRIBUTING.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9b0e48f9f..38889becf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,9 @@ You can contribute to the Redox documentation and code on the following reposito - [libredox](https://gitlab.redox-os.org/redox-os/libredox) - Redox System Library - [netstack](https://gitlab.redox-os.org/redox-os/netstack) - Network Stack - [Bootloader](https://gitlab.redox-os.org/redox-os/bootloader) +- [RedoxFS](https://gitlab.redox-os.org/redox-os/redoxfs) - Default filesystem - [Drivers](https://gitlab.redox-os.org/redox-os/drivers) - Device Drivers +- [Base](https://gitlab.redox-os.org/redox-os/base) - Essential system daemons - [Kernel](https://gitlab.redox-os.org/redox-os/kernel) To see all Redox repositories open the [redox-os group](https://gitlab.redox-os.org/redox-os). @@ -49,8 +51,11 @@ To see all Redox repositories open the [redox-os group](https://gitlab.redox-os. If you don't know programming: -- Write documentation -- Use and test Redox, and file issues for bugs or needed features (please check for duplicates first etc.) +- Test the [Redox images](https://static.redox-os.org/img/) on your computer and add the report on the [Hardware Compatibility](https://gitlab.redox-os.org/redox-os/redox/-/blob/master/HARDWARE.md) list +- Monitor and warn developers if the [Redox images](https://static.redox-os.org/img/) are outdated +- Use and test Redox, and file issues for bugs or needed features (please check for duplicates first) +- Fix and write documentation +- Find or fix typos in configuration If you don't know how to code in Rust, but know other programming languages: From fcbfdcdfbc9a170bd3dba366128f8f5706aeca5d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 18 Jun 2025 16:53:14 -0600 Subject: [PATCH 20/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 51bad855b..48766ebaf 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 51bad855b00fddc4f78f638c3f9adc2592341a0a +Subproject commit 48766ebaf7a8826a1e727f735ccfd40d2212473d From 4fff611e10c01433985c64878e7a0dfd8628db18 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 18 Jun 2025 20:47:58 -0600 Subject: [PATCH 21/34] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 48766ebaf..ab8e300cf 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 48766ebaf7a8826a1e727f735ccfd40d2212473d +Subproject commit ab8e300cf698eccf7a0fc7773c62980a87702a93 From ddb5ff532c2c450541436db611b06033bf90755f Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 19 Jun 2025 23:11:08 -0300 Subject: [PATCH 22/34] Improve the explanation of two items in CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 38889becf..93d97a029 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,8 +51,8 @@ To see all Redox repositories open the [redox-os group](https://gitlab.redox-os. If you don't know programming: -- Test the [Redox images](https://static.redox-os.org/img/) on your computer and add the report on the [Hardware Compatibility](https://gitlab.redox-os.org/redox-os/redox/-/blob/master/HARDWARE.md) list -- Monitor and warn developers if the [Redox images](https://static.redox-os.org/img/) are outdated +- Test the [daily images](https://static.redox-os.org/img/) on your computer and add the report on the [Hardware Compatibility](https://gitlab.redox-os.org/redox-os/redox/-/blob/master/HARDWARE.md) list +- Monitor and warn developers if the [daily images](https://static.redox-os.org/img/) are outdated - Use and test Redox, and file issues for bugs or needed features (please check for duplicates first) - Fix and write documentation - Find or fix typos in configuration From b25fbb39002619a63211a5af823c96fb1b536b17 Mon Sep 17 00:00:00 2001 From: David Campbell Date: Fri, 13 Jun 2025 14:55:20 -0400 Subject: [PATCH 23/34] Add BROWSER environment variable to desktop config. --- config/desktop.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/desktop.toml b/config/desktop.toml index 152371b1e..694454ffd 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -29,6 +29,7 @@ patchelf = {} path = "/usr/lib/init.d/20_orbital" data = """ audiod +export BROWSER /bin/netsurf-fb export VT 3 orbital orblogin launcher unset VT From 4be6155e42b88a94ef527340baa72052b98b551f Mon Sep 17 00:00:00 2001 From: David Campbell Date: Fri, 13 Jun 2025 15:02:31 -0400 Subject: [PATCH 24/34] unset BROWSER after starting orbital. --- config/desktop.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/desktop.toml b/config/desktop.toml index 694454ffd..2d354bb0d 100644 --- a/config/desktop.toml +++ b/config/desktop.toml @@ -32,6 +32,7 @@ audiod export BROWSER /bin/netsurf-fb export VT 3 orbital orblogin launcher +unset BROWSER unset VT """ From 42b1a1c14a9c57d0c63a62ea03b7e2043b313785 Mon Sep 17 00:00:00 2001 From: Petr Hrdina Date: Sun, 22 Jun 2025 12:34:42 +0200 Subject: [PATCH 25/34] Add make recipe commands for multiple targets --- mk/repo.mk | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/mk/repo.mk b/mk/repo.mk index 3f6ad7872..38092b690 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -51,6 +51,16 @@ else ./clean.sh $* endif +comma := , + +# Invoke clean.sh for multiple targets +cl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),c.$(target)) +endif + # Invoke fetch.sh for a single target f.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) @@ -62,6 +72,14 @@ else ./fetch.sh $* endif +# Invoke fetch.sh for multiple targets +fl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),f.$(target)) +endif + # Invoke repo.sh for a single target r.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) @@ -73,6 +91,14 @@ else ./repo.sh $* endif +# Invoke repo.sh for multiple targets +rl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),r.$(target)) +endif + # Invoke unfetch.sh for a single target u.%: $(FSTOOLS_TAG) FORCE ifeq ($(PODMAN_BUILD),1) @@ -84,20 +110,64 @@ else ./unfetch.sh $* endif +# Invoke unfetch.sh for multiple targets +ul.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),u.$(target)) +endif + # Invoke clean.sh, and repo.sh for a single target cr.%: $(FSTOOLS_TAG) FORCE $(MAKE) c.$* $(MAKE) r.$* +# Invoke clean.sh and repo.sh for multiple targets +crl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),c.$(target)) + $(MAKE) $(foreach target,$(subst $(comma), ,$*),r.$(target)) +endif + # Invoke unfetch.sh, clean.sh, and repo.sh for a single target ucr.%: $(FSTOOLS_TAG) FORCE $(MAKE) u.$* $(MAKE) cr.$* +# Invoke unfetch.sh, clean.sh and repo.sh for multiple targets +ucrl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),u.$(target)) + $(MAKE) $(foreach target,$(subst $(comma), ,$*),cr.$(target)) +endif + uc.%: $(FSTOOLS_TAG) FORCE $(MAKE) u.$* $(MAKE) c.$* +# Invoke unfetch.sh and clean.sh for multiple targets +ucl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),u.$(target)) + $(MAKE) $(foreach target,$(subst $(comma), ,$*),c.$(target)) +endif + ucf.%: $(FSTOOLS_TAG) FORCE $(MAKE) uc.$* $(MAKE) f.$* + +# Invoke unfetch, clean.sh and fetch.sh for multiple targets +ucfl.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) $(MAKE) $@ +else + $(MAKE) $(foreach target,$(subst $(comma), ,$*),uc.$(target)) + $(MAKE) $(foreach target,$(subst $(comma), ,$*),f.$(target)) +endif From 811e267642c9677610e30545b05f4dc4334bac28 Mon Sep 17 00:00:00 2001 From: Petr Hrdina Date: Sun, 22 Jun 2025 12:35:04 +0200 Subject: [PATCH 26/34] Speedup category.sh for podman build --- scripts/category.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/category.sh b/scripts/category.sh index 933fab793..28e815d77 100755 --- a/scripts/category.sh +++ b/scripts/category.sh @@ -10,13 +10,22 @@ then exit 1 fi -set -x - action="${1#-}" +recipe_list="" +first=1 + for recipe in `find cookbook/recipes/"$2" -name "recipe.*"` do recipe_folder=`dirname "$recipe"` recipe_name=`basename "$recipe_folder"` - make "$action"."$recipe_name" -done \ No newline at end of file + if [ "$first" -eq 1 ]; then + recipe_list="$recipe_name" + first=0 + else + recipe_list="$recipe_list,$recipe_name" + fi +done + +set -x +make "$action"l."$recipe_list" From ccb1509f0090793262977d599e2fc3f1e8b72cae Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 22 Jun 2025 20:13:59 +0200 Subject: [PATCH 27/34] Rename redox-live.img to redox-live.iso --- mk/disk.mk | 2 +- redox.ipxe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/disk.mk b/mk/disk.mk index c23a72c3c..2ab57bcc1 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -28,7 +28,7 @@ $(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/livedisk.iso rm -r $(BUILD)/tftproot || true mkdir $(BUILD)/tftproot cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi - ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.img + ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.iso cp redox.ipxe $(BUILD)/tftproot/redox.ipxe $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) diff --git a/redox.ipxe b/redox.ipxe index f92772110..265e09176 100644 --- a/redox.ipxe +++ b/redox.ipxe @@ -1,5 +1,5 @@ #!ipxe kernel bootloader-live.efi -initrd redox-live.img +initrd redox-live.iso boot From d2fde06fd1a7fae01cd321a89b9772aa863e210f Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 22 Jun 2025 20:20:09 +0200 Subject: [PATCH 28/34] Rename livedisk.iso to redox-live.iso --- Makefile | 14 +++++++------- build.sh | 2 +- mk/ci.mk | 6 +++--- mk/disk.mk | 6 +++--- mk/qemu.mk | 2 +- scripts/ventoy.sh | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 8af03f3ea..5e323480c 100644 --- a/Makefile +++ b/Makefile @@ -10,28 +10,28 @@ all: $(BUILD)/harddrive.img live: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -f $(BUILD)/livedisk.iso - $(MAKE) $(BUILD)/livedisk.iso + rm -f $(BUILD)/redox-live.iso + $(MAKE) $(BUILD)/redox-live.iso netboot: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -rf $(BUILD)/livedisk.iso $(BUILD)/tftproot + rm -rf $(BUILD)/redox-live.iso $(BUILD)/tftproot $(MAKE) $(BUILD)/tftproot -popsicle: $(BUILD)/livedisk.iso - popsicle-gtk $(BUILD)/livedisk.iso +popsicle: $(BUILD)/redox-live.iso + popsicle-gtk $(BUILD)/redox-live.iso image: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -f $(BUILD)/harddrive.img $(BUILD)/livedisk.iso + rm -f $(BUILD)/harddrive.img $(BUILD)/redox-live.iso $(MAKE) all rebuild: -$(FUMOUNT) $(BUILD)/filesystem/ || true -$(FUMOUNT) /tmp/redox_installer/ || true - rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/livedisk.iso + rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/redox-live.iso $(MAKE) all clean: $(CONTAINER_TAG) diff --git a/build.sh b/build.sh index 72249adc9..da48a43f3 100755 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ usage() echo " config/ARCH/CONFIG.toml" echo " If you specify both CONFIG and FILESYSTEM_CONFIG, it is not" echo " necessary that they match, but it is recommended." - echo " Examples: ./build.sh -c demo live - make build/x86_64/demo/livedisk.iso" + echo " Examples: ./build.sh -c demo live - make build/x86_64/demo/redox-live.iso" echo " ./build.sh -6 qemu - make build/i686/desktop/harddrive.img and" echo " and run it in qemu" echo " NOTE: If you do not change ARCH or CONFIG very often, edit mk/config.mk" diff --git a/mk/ci.mk b/mk/ci.mk index 16270a6e7..9d7cde36d 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -15,11 +15,11 @@ ci-img: FORCE # The name of the target must match the name of the filesystem config file minimal minimal-net server desktop demo: FORCE - rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso" - $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso + rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/redox-live.iso" + $(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/redox-live.iso mkdir -p $(IMG_DIR) cp "build/$(ARCH)/$@/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img" - cp "build/$(ARCH)/$@/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso" + cp "build/$(ARCH)/$@/redox-live.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_redox-live.iso" # CI packaging target ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE diff --git a/mk/disk.mk b/mk/disk.mk index 2ab57bcc1..a3c64a394 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -12,7 +12,7 @@ $(BUILD)/harddrive.img: $(HOST_FSTOOLS) $(REPO_TAG) umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial mv $@.partial $@ -$(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG) +$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) mkdir -p $(BUILD) rm -rf $@ $@.partial -$(FUMOUNT) /tmp/redox_installer || true @@ -24,11 +24,11 @@ $(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG) umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial mv $@.partial $@ -$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/livedisk.iso +$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/redox-live.iso rm -r $(BUILD)/tftproot || true mkdir $(BUILD)/tftproot cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi - ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.iso + ln -s ../redox-live.iso $(BUILD)/tftproot/redox-live.iso cp redox.ipxe $(BUILD)/tftproot/redox.ipxe $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) diff --git a/mk/qemu.mk b/mk/qemu.mk index b91923f7b..14eef958b 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -108,7 +108,7 @@ ifneq ($(QEMU_KERNEL),) endif ifeq ($(live),yes) - DISK=$(BUILD)/livedisk.iso + DISK=$(BUILD)/redox-live.iso else DISK=$(BUILD)/harddrive.img endif diff --git a/scripts/ventoy.sh b/scripts/ventoy.sh index 8022f04be..e3ac3beda 100755 --- a/scripts/ventoy.sh +++ b/scripts/ventoy.sh @@ -24,7 +24,7 @@ for ARCH in "${ARCHS[@]}" do for CONFIG_NAME in "${CONFIGS[@]}" do - IMAGE="build/${ARCH}/${CONFIG_NAME}/livedisk.iso" + IMAGE="build/${ARCH}/${CONFIG_NAME}/redox-live.iso" make ARCH="${ARCH}" CONFIG_NAME="${CONFIG_NAME}" "${IMAGE}" cp -v "${IMAGE}" "${VENTOY}/redox-${CONFIG_NAME}-${ARCH}.iso" done From fb64e5e9b85c5c217355fb5a5d65b6c272a95356 Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Sun, 22 Jun 2025 20:23:28 +0200 Subject: [PATCH 29/34] Use the build dir as tftproot and build a suitable tftproot when building the live disk --- Makefile | 6 ------ mk/disk.mk | 10 ++-------- mk/qemu.mk | 6 +----- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 5e323480c..cbc345cb0 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,6 @@ live: rm -f $(BUILD)/redox-live.iso $(MAKE) $(BUILD)/redox-live.iso -netboot: - -$(FUMOUNT) $(BUILD)/filesystem/ || true - -$(FUMOUNT) /tmp/redox_installer/ || true - rm -rf $(BUILD)/redox-live.iso $(BUILD)/tftproot - $(MAKE) $(BUILD)/tftproot - popsicle: $(BUILD)/redox-live.iso popsicle-gtk $(BUILD)/redox-live.iso diff --git a/mk/disk.mk b/mk/disk.mk index a3c64a394..c26d9a6cb 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -12,7 +12,7 @@ $(BUILD)/harddrive.img: $(HOST_FSTOOLS) $(REPO_TAG) umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial mv $@.partial $@ -$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) +$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) redox.ipxe mkdir -p $(BUILD) rm -rf $@ $@.partial -$(FUMOUNT) /tmp/redox_installer || true @@ -23,13 +23,7 @@ $(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) truncate -s "$$FILESYSTEM_SIZE"m $@.partial umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial mv $@.partial $@ - -$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/redox-live.iso - rm -r $(BUILD)/tftproot || true - mkdir $(BUILD)/tftproot - cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi - ln -s ../redox-live.iso $(BUILD)/tftproot/redox-live.iso - cp redox.ipxe $(BUILD)/tftproot/redox.ipxe + cp redox.ipxe $(BUILD)/redox.ipxe $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG) mkdir -p $(BUILD) diff --git a/mk/qemu.mk b/mk/qemu.mk index 14eef958b..6036d0fcb 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -151,7 +151,7 @@ else EXTRANETARGS= ifeq ($(netboot),yes) - EXTRANETARGS+=,tftp=$(BUILD)/tftproot,bootfile=redox.ipxe + EXTRANETARGS+=,tftp=$(BUILD),bootfile=redox.ipxe endif ifneq ($(bridge),) @@ -242,10 +242,6 @@ qemu-deps:$(FIRMWARE) qemu-deps:$(QEMU_KERNEL) -ifeq ($(netboot),yes) -qemu-deps: $(BUILD)/tftproot -endif - qemu-deps: $(PFLASH0) ifneq ($(PFLASH1),) From 5404cae76ce8f836db04a0335d43a266b568be56 Mon Sep 17 00:00:00 2001 From: Petr Hrdina Date: Sun, 22 Jun 2025 21:02:47 +0200 Subject: [PATCH 30/34] Add libgcc to build server CI --- config/aarch64/ci.toml | 1 + config/i686/ci.toml | 1 + config/riscv64gc/ci.toml | 1 + config/x86_64/ci.toml | 1 + 4 files changed, 4 insertions(+) diff --git a/config/aarch64/ci.toml b/config/aarch64/ci.toml index 5ae783740..b27a2788a 100644 --- a/config/aarch64/ci.toml +++ b/config/aarch64/ci.toml @@ -23,6 +23,7 @@ installer = {} installer-gui = {} ion = {} kernel = {} +libgcc = {} #nano = {} # error compiling ncurses netdb = {} #netsurf = {} # error building openssl1 diff --git a/config/i686/ci.toml b/config/i686/ci.toml index 44b99e8a2..97e374613 100644 --- a/config/i686/ci.toml +++ b/config/i686/ci.toml @@ -23,6 +23,7 @@ installer = {} installer-gui = {} ion = {} kernel = {} +libgcc = {} nano = {} netdb = {} netsurf = {} diff --git a/config/riscv64gc/ci.toml b/config/riscv64gc/ci.toml index bd928a769..b383e7ac5 100644 --- a/config/riscv64gc/ci.toml +++ b/config/riscv64gc/ci.toml @@ -23,6 +23,7 @@ installer = {} #installer-gui = {} # redox_syscall 0.4 not working on riscv64gc? ion = {} kernel = {} +libgcc = {} #nano = {} # error compiling ncurses netdb = {} #netsurf = {} # error compiling nghttp2 diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index cfd2ae50c..e0cd3f1ca 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -84,6 +84,7 @@ kibi = {} lci = {} libc-bench = {} libffi = {} +libgcc = {} libgmp = {} libiconv = {} libjpeg = {} From e36fdf54c409750a77c9d8fd1952a82be33add76 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Tue, 24 Jun 2025 10:39:51 +0000 Subject: [PATCH 31/34] Fix podman continously trying to rebuild libtool-build --- mk/prefix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index f8d675643..db2a410e7 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -86,7 +86,7 @@ $(PREFIX)/libtool: echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version mv "$@.partial" "$@" -$(PREFIX)/libtool-build: $(PREFIX)/libtool $(CONTAINER_TAG) +$(PREFIX)/libtool-build: $(PREFIX)/libtool $(PREFIX)/rust-install ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) $(MAKE) $@ else From b4ca9e617c1a7b5f51dbcfce2d41f526035efd0c Mon Sep 17 00:00:00 2001 From: bjorn3 <17426603+bjorn3@users.noreply.github.com> Date: Tue, 24 Jun 2025 20:53:40 +0200 Subject: [PATCH 32/34] Use http to download redox-live.iso during netbooting --- redox.ipxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redox.ipxe b/redox.ipxe index 265e09176..99008dcbd 100644 --- a/redox.ipxe +++ b/redox.ipxe @@ -1,5 +1,5 @@ #!ipxe kernel bootloader-live.efi -initrd redox-live.iso +initrd http://${next-server}:8080/redox-live.iso boot From 1783928192bbc0eb06162be000a1b7d77ce78c2d Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 24 Jun 2025 21:39:00 -0300 Subject: [PATCH 33/34] Improve the "Chat" section and add more GitLab information in CONTRIBUTING.md --- CONTRIBUTING.md | 101 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 69 insertions(+), 32 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 93d97a029..f1f8d10ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,6 +22,75 @@ Please review the `LICENSE` file for the project you are contributing to. Join us on [Matrix Chat](https://doc.redox-os.org/book/chat.html) to discuss issues or ask questions. +### [Matrix](https://matrix.to/#/#redox-join:matrix.org) + +Matrix is the official way to talk with Redox OS team and community (these rooms are English-only, we don't accept other languages because we don't understand them). + +Matrix has several different clients. [Element](https://element.io/) is a commonly used choice, it works on web browsers, Linux, MacOSX, Windows, Android and iOS. + +If you have problems with Element, try [Fractal](https://gitlab.gnome.org/World/fractal). + +- Join the [Join Requests](https://matrix.to/#/#redox-join:matrix.org) room and send a message requesting for an invite to the Redox Matrix space (the purpose of this is to avoid spam and bots). +- #redox-join:matrix.org (Use this Matrix room address if you don't want to use the external Matrix link) + +(We recommend that you leave the "Join Requests" room after your entry on Redox space) + +If you want to have a big discussion in our rooms, you should use a Element thread, it's more organized and easy to keep track if more discussions happen on the same room. + +You cand find more information on the [Chat](https://doc.redox-os.org/book/chat.html) page. + +### [Discord](https://discord.gg/JfggvrHGDY) + +We have a Discord server as an alternative for Matrix, open the #join-requests channel and send a message requesting to be a member (the purpose of this is to avoid spam and bots) + +The Matrix messages are sent to Discord and vice-versa using a bot, but sometimes some Discord messages aren't sent to Matrix (if this happens to you join in our Matrix space above) + +## [GitLab](https://gitlab.redox-os.org/redox-os/redox) + +A slightly more formal way of communication with fellow Redox developers, but a little less quick and convenient like the chat. Submit an issue when you run into problems compiling or testing. Issues can also be used if you would like to discuss a certain topic: be it features, code style, code inconsistencies, minor changes and fixes, etc. + +If you want to create an account, read the [Signing in to GitLab](https://doc.redox-os.org/book/signing-in-to-gitlab.html) page. + +Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications). + +By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten. + +If you have ready MRs (merge requests) you must send the links in the [MRs](https://matrix.to/#/#redox-mrs:matrix.org) room. To join this room, you will need to request an invite in the [Join Requests](https://matrix.to/#/#redox-join:matrix.org) room. + +By sending a message in the room, your MR will not be forgotten or accumulate conflicts. + +## Best Practices and Guidelines + +You can read the best practices and guidelines on the [Best practices and guidelines](https://doc.redox-os.org/book/best-practices.html) chapter. + +## Style Guidelines + +### Rust + +Since **Rust** is a relatively small and new language compared to others like C and C++, there's really only one standard. Just follow the official Rust standards for formatting, and maybe run `rustfmt` on your changes, until we setup the CI system to do it automatically. + +### Git + +Please follow our [Git style](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for pull requests. + +## GitLab + +### Identity + +Once your GitLab account is created, you should add your Matrix or Discord username (the name after the `@` symbol) on the "About" section of your profile, that way we recognize you properly. + +### Issues + +To know how to create issues on the Redox GitLab, read the [Filing Issues](https://doc.redox-os.org/book/filing-issues.html) page. + +Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications). + +By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten. + +### Pull Requests + +Please follow [our process](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for creating proper pull requests. + ## Important Places to Contribute Before starting to contribute, we recommend reading the [Website FAQ](https://www.redox-os.org/faq/) and the [Redox Book](https://doc.redox-os.org/book/). @@ -157,38 +226,6 @@ We maintain a list of wikis, articles and videos to learn Rust, OS development a If you are skilled there's a possibility that they could improve your knowledge in some way. -## Best Practices and Guidelines - -You can read the best practices and guidelines on the [Best practices and guidelines](https://doc.redox-os.org/book/best-practices.html) chapter. - -## Style Guidelines - -### Rust - -Since **Rust** is a relatively small and new language compared to others like C and C++, there's really only one standard. Just follow the official Rust standards for formatting, and maybe run `rustfmt` on your changes, until we setup the CI system to do it automatically. - -### Git - -Please follow our [Git style](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for pull requests. - -## GitLab - -### Identity - -Once your GitLab account is created, you should add your Matrix or Discord username (the name after the `@` symbol) on the "About" section of your profile, that way we recognize you properly. - -### Issues - -To know how to create issues on the Redox GitLab, read the [Filing Issues](https://doc.redox-os.org/book/filing-issues.html) page. - -Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications). - -By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten. - -### Pull Requests - -Please follow [our process](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for creating proper pull requests. - ## Other Ways to Contribute If you aren't good on coding, but you still want to help keep the project going, you can contribute and support in a variety of ways! We'll try to find a way to use anything you have to offer. From 38dda81b47020f14bdd9ff902a7912b1ea063d36 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 24 Jun 2025 21:42:50 -0300 Subject: [PATCH 34/34] Improve the "Chat" section explanation --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1f8d10ae..e34370b6a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ Please review the `LICENSE` file for the project you are contributing to. ## Chat -Join us on [Matrix Chat](https://doc.redox-os.org/book/chat.html) to discuss issues or ask questions. +You can join in our chat platforms to discuss development, issues or ask questions. ### [Matrix](https://matrix.to/#/#redox-join:matrix.org)