Merge branch 'wget-arch' into 'master'

Add wget to Arch dependencies See merge request redox-os/redox!1563
Improve the explanation of two items in CONTRIBUTING.md
2026-07-04 10:38:46 +08:00 · 2025-06-22 13:43:04 +00:00 · 2025-06-19 23:11:08 -03:00 · 2025-06-18 20:47:58 -06:00 · 2025-06-18 16:53:18 -06:00 · 2025-06-18 16:53:14 -06:00
14 changed files with 63 additions and 27 deletions
--- 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"
--- 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 [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

 If you don't know how to code in Rust, but know other programming languages:

--- a/6
+++ b/6
@ -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

--- 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

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2dfe26c6682fa527f66c31c2a47a4b49f7305117
+Subproject commit ab8e300cf698eccf7a0fc7773c62980a87702a93
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9e888c06fa8b5b28c053dc49bfc9a0a92c533a75
+Subproject commit 2c3afb4956f2238505cd7d1df56388af5c6ae8a9
--- 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
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@ -76,6 +76,7 @@ $(PREFIX)/libtool:

 	git clone \
 		--recurse-submodules \
+		--shallow-submodules \
 		"https://gitlab.redox-os.org/redox-os/libtool/" \
 		--branch "v$(LIBTOOL_VERSION)-redox" \
 		--depth 2 \
--- 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),)
--- 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
--- a/podman_bootstrap.sh
+++ b/podman_bootstrap.sh
@ -187,7 +187,7 @@ archLinux()
 {

 	echo "Detected Arch Linux"
-	packages="git make curl fuse3 fuse-overlayfs slirp4netns podman gdb"
+	packages="git make curl fuse3 fuse-overlayfs slirp4netns podman gdb wget"
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
 	elif [ "$1" == "virtualbox" ]; then
--- a/redox.ipxe
+++ b/redox.ipxe
@ -0,0 +1,5 @@
+#!ipxe
+
+kernel bootloader-live.efi
+initrd redox-live.img
+boot
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 940b027514506ec5d0437418c567aff510e91b83
+Subproject commit 066e5f6e8a98c2343082b4cac0746daaeb2c2b62
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit be49c1936a2dfed51050ac4ece1e4ae05b297208
+Subproject commit 63418095e578459452b341d6d3c084efabf7f574
Author	SHA1	Message	Date
skilfingr	7cd906ae29	Merge branch 'wget-arch' into 'master' Add wget to Arch dependencies See merge request redox-os/redox!1563	2025-06-22 13:43:04 +00:00
Ribbon	ddb5ff532c	Improve the explanation of two items in CONTRIBUTING.md	2025-06-19 23:11:08 -03:00
Jeremy Soller	4fff611e10	Update cookbook	2025-06-18 20:47:58 -06:00
Jeremy Soller	e95c229677	Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox	2025-06-18 16:53:18 -06:00
Jeremy Soller	fcbfdcdfbc	Update cookbook	2025-06-18 16:53:14 -06:00
Ribbon	8a1ed957f7	Improve CONTRIBUTING.md	2025-06-16 17:14:12 -03:00
Ribbon	70489f9452	Add and improve items on the ecosystem table in the README	2025-06-16 16:33:10 -03:00
Jeremy Soller	8143dbf021	Update cookbook	2025-06-15 21:12:32 -06:00
Jeremy Soller	ab49ed59ec	Update cookbook	2025-06-13 15:47:14 -06:00
Jeremy Soller	df9d92d250	Update cookbook	2025-06-13 15:27:06 -06:00
Jeremy Soller	ce6db377f8	Update cookbook	2025-06-13 15:12:14 -06:00
Jeremy Soller	114ceca0eb	Update cookbook	2025-06-13 12:30:14 -06:00
Jeremy Soller	d9b396a662	Update cookbook	2025-06-13 11:18:13 -06:00
Jeremy Soller	0efb4e6435	Merge branch 'git-for-older' into 'master' Make libtool cloning works for older git See merge request redox-os/redox!1587	2025-06-12 20:21:51 -06:00
Wildan Mubarok	5ebd0729f9	Make libtool cloning works for older git	2025-06-13 02:16:00 +00:00
Jeremy Soller	3b67441ef1	Update cookbook	2025-06-12 13:04:26 -06:00
Jeremy Soller	7cd845f0de	Update submodules	2025-06-12 12:25:16 -06:00
Jeremy Soller	ae6acd03c2	Update installer	2025-06-12 11:57:07 -06:00
Jeremy Soller	0952932bfb	Update cookbook	2025-06-12 11:49:01 -06:00
Jeremy Soller	64d96d6429	Update cookbook	2025-06-12 11:12:24 -06:00
Jeremy Soller	691d845d4b	Merge branch 'virtualbox-deprecated-audio-switch' into 'master' vbox: --audio is deprecated/removed See merge request redox-os/redox!1586	2025-06-12 11:03:05 -06:00
Jeremy Soller	05e7695761	Merge branch 'faster-libtool-clone' into 'master' Speedup cloning libtool See merge request redox-os/redox!1584	2025-06-12 10:54:46 -06:00
Jeremy Soller	9750f5548d	Update submodules	2025-06-12 10:53:16 -06:00
Jeremy Soller	fc4651c272	Merge branch 'netboot' into 'master' Add support for netboot See merge request redox-os/redox!1583	2025-06-12 10:52:48 -06:00
Jeremy Soller	767063380d	Merge branch 'patch-ci-fix' into 'master' Fix CI regarding to glibc version See merge request redox-os/redox!1582	2025-06-12 10:50:29 -06:00
Josh Megnauth	e352fe6bfd	vbox: --audio is deprecated/removed --audio-driver is the replacement switch.	2025-06-06 23:54:29 -04:00
Wildan Mubarok	ed0da0981b	Speedup cloning libtool	2025-06-03 18:35:10 +00:00
bjorn3	41b51f692a	Add support for netboot This includes building a tftp root and using it with qemu.	2025-06-01 20:54:56 +02:00
Wildan M	19673cc850	Fix CI regarding to glibc version	2025-05-30 05:41:46 +07:00
Skilvingr	0cccf83bf0	add wget to Arch dependencies	2025-03-10 17:25:40 +01:00